From patchwork Sat Feb 5 02:18:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 532351 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 p14II5E9009382 for ; Fri, 4 Feb 2011 18:18:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750858Ab1BDSSF (ORCPT ); Fri, 4 Feb 2011 13:18:05 -0500 Received: from db3ehsobe002.messaging.microsoft.com ([213.199.154.140]:25665 "EHLO DB3EHSOBE002.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750837Ab1BDSSE (ORCPT ); Fri, 4 Feb 2011 13:18:04 -0500 Received: from mail7-db3-R.bigfish.com (10.3.81.246) by DB3EHSOBE002.bigfish.com (10.3.84.22) with Microsoft SMTP Server id 14.1.225.8; Fri, 4 Feb 2011 18:18:03 +0000 Received: from mail7-db3 (localhost.localdomain [127.0.0.1]) by mail7-db3-R.bigfish.com (Postfix) with ESMTP id EB3CED043F; Fri, 4 Feb 2011 18:18:02 +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:az33egw02.freescale.net; RD:az33egw02.freescale.net; EFVD:NLI Received: from mail7-db3 (localhost.localdomain [127.0.0.1]) by mail7-db3 (MessageSwitch) id 1296843482816704_30265; Fri, 4 Feb 2011 18:18:02 +0000 (UTC) Received: from DB3EHSMHS006.bigfish.com (unknown [10.3.81.241]) by mail7-db3.bigfish.com (Postfix) with ESMTP id ADE3314F004C; Fri, 4 Feb 2011 18:18:02 +0000 (UTC) Received: from az33egw02.freescale.net (192.88.158.103) by DB3EHSMHS006.bigfish.com (10.3.87.106) with Microsoft SMTP Server (TLS) id 14.1.225.8; Fri, 4 Feb 2011 18:18:01 +0000 Received: from az33smr02.freescale.net (az33smr02.freescale.net [10.64.34.200]) by az33egw02.freescale.net (8.14.3/8.14.3) with ESMTP id p14IHwRx001068; Fri, 4 Feb 2011 11:17:58 -0700 (MST) Received: from S2101-09.ap.freescale.net (mvp-10-192-184-3.ap.freescale.net [10.192.184.3]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p14IHlCR020234; Fri, 4 Feb 2011 12:17:54 -0600 (CST) From: Shawn Guo To: , , , , CC: Shawn Guo Subject: [PATCH 2/7] ARM: mxs/clock: fix base address missing in name##_set_parent Date: Sat, 5 Feb 2011 10:18:42 +0800 Message-ID: <1296872327-21166-3-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1296872327-21166-1-git-send-email-shawn.guo@freescale.com> References: <1296872327-21166-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]); Fri, 04 Feb 2011 18:18:06 +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; \ } \ \