From patchwork Mon Feb 14 02:32:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 553261 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1DISt6S022252 for ; Sun, 13 Feb 2011 18:31:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754698Ab1BMSbD (ORCPT ); Sun, 13 Feb 2011 13:31:03 -0500 Received: from ch1outboundpool.messaging.microsoft.com ([216.32.181.183]:58432 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754676Ab1BMSbD (ORCPT ); Sun, 13 Feb 2011 13:31:03 -0500 Received: from mail44-ch1-R.bigfish.com (216.32.181.171) by CH1EHSOBE001.bigfish.com (10.43.70.51) with Microsoft SMTP Server id 14.1.225.8; Sun, 13 Feb 2011 18:30:59 +0000 Received: from mail44-ch1 (localhost.localdomain [127.0.0.1]) by mail44-ch1-R.bigfish.com (Postfix) with ESMTP id 8DD0D9A82AB; Sun, 13 Feb 2011 18:30:59 +0000 (UTC) X-SpamScore: -3 X-BigFish: VS-3(zzbb2cKzz1202hzz8275bhz2dh2a8h668h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:de01egw01.freescale.net; RD:de01egw01.freescale.net; EFVD:NLI Received: from mail44-ch1 (localhost.localdomain [127.0.0.1]) by mail44-ch1 (MessageSwitch) id 1297621859286755_4807; Sun, 13 Feb 2011 18:30:59 +0000 (UTC) Received: from CH1EHSMHS005.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.246]) by mail44-ch1.bigfish.com (Postfix) with ESMTP id 422012C004B; Sun, 13 Feb 2011 18:30:59 +0000 (UTC) Received: from de01egw01.freescale.net (192.88.165.102) by CH1EHSMHS005.bigfish.com (10.43.70.5) with Microsoft SMTP Server (TLS) id 14.1.225.8; Sun, 13 Feb 2011 18:30:58 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by de01egw01.freescale.net (8.14.3/8.14.3) with ESMTP id p1DIUsla014097; Sun, 13 Feb 2011 11:30:54 -0700 (MST) Received: from S2101-09.ap.freescale.net (mvp-10-192-184-6.ap.freescale.net [10.192.184.6]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p1DIUgKD022479; Sun, 13 Feb 2011 12:30:50 -0600 (CST) From: Shawn Guo To: , , , , , CC: Shawn Guo Subject: [PATCH v2 2/7] ARM: mxs/clock: fix base address missing in name##_set_parent Date: Mon, 14 Feb 2011 10:32:21 +0800 Message-ID: <1297650746-12841-3-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1297650746-12841-1-git-send-email-shawn.guo@freescale.com> References: <1297650746-12841-1-git-send-email-shawn.guo@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 13 Feb 2011 18:31:04 +0000 (UTC) diff --git a/arch/arm/mach-mxs/clock-mx23.c b/arch/arm/mach-mxs/clock-mx23.c index 350b28c..c19b69a 100644 --- a/arch/arm/mach-mxs/clock-mx23.c +++ b/arch/arm/mach-mxs/clock-mx23.c @@ -347,7 +347,7 @@ static int name##_set_parent(struct clk *clk, struct clk *parent) \ { \ if (parent != clk->parent) { \ __raw_writel(BM_CLKCTRL_CLKSEQ_BYPASS_##bit, \ - HW_CLKCTRL_CLKSEQ_TOG); \ + CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ_TOG); \ clk->parent = parent; \ } \ \ diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c index a3b4787..9f4ee36 100644 --- a/arch/arm/mach-mxs/clock-mx28.c +++ b/arch/arm/mach-mxs/clock-mx28.c @@ -483,7 +483,7 @@ static int name##_set_parent(struct clk *clk, struct clk *parent) \ { \ if (parent != clk->parent) { \ __raw_writel(BM_CLKCTRL_CLKSEQ_BYPASS_##bit, \ - HW_CLKCTRL_CLKSEQ_TOG); \ + CLKCTRL_BASE_ADDR + HW_CLKCTRL_CLKSEQ_TOG); \ clk->parent = parent; \ } \ \