From patchwork Tue Aug 2 08:39:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lin X-Patchwork-Id: 1028352 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p728XUXp020633 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 2 Aug 2011 08:33:51 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QoAPd-0002hm-RY; Tue, 02 Aug 2011 08:33:18 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QoAPc-0007vm-V3; Tue, 02 Aug 2011 08:33:16 +0000 Received: from db3ehsobe002.messaging.microsoft.com ([213.199.154.140] helo=DB3EHSOBE002.bigfish.com) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QoAP4-0007oM-Fh for linux-arm-kernel@lists.infradead.org; Tue, 02 Aug 2011 08:32:43 +0000 Received: from mail92-db3-R.bigfish.com (10.3.81.250) by DB3EHSOBE002.bigfish.com (10.3.84.22) with Microsoft SMTP Server id 14.1.225.22; Tue, 2 Aug 2011 08:32:40 +0000 Received: from mail92-db3 (localhost.localdomain [127.0.0.1]) by mail92-db3-R.bigfish.com (Postfix) with ESMTP id B85371A301DF; Tue, 2 Aug 2011 08:32:40 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-SS: 13, Received: from mail92-db3 (localhost.localdomain [127.0.0.1]) by mail92-db3 (MessageSwitch) id 1312273960586380_17534; Tue, 2 Aug 2011 08:32:40 +0000 (UTC) Received: from DB3EHSMHS018.bigfish.com (unknown [10.3.81.245]) by mail92-db3.bigfish.com (Postfix) with ESMTP id 805A814A004D; Tue, 2 Aug 2011 08:32:40 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB3EHSMHS018.bigfish.com (10.3.87.118) with Microsoft SMTP Server (TLS) id 14.1.225.22; Tue, 2 Aug 2011 08:32:40 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.289.8; Tue, 2 Aug 2011 03:32:38 -0500 Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p728WUAU002387; Tue, 2 Aug 2011 03:32:37 -0500 (CDT) From: Tony Lin To: Subject: [PATCH v4 3/7] ARM: mxs: add usb clocks to clock tree Date: Tue, 2 Aug 2011 16:39:42 +0800 Message-ID: <1312274386-6833-4-git-send-email-tony.lin@freescale.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1312274386-6833-1-git-send-email-tony.lin@freescale.com> References: <1312274386-6833-1-git-send-email-tony.lin@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110802_043242_734335_427DCE50 X-CRM114-Status: GOOD ( 14.16 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [213.199.154.140 listed in list.dnswl.org] Cc: s.hauer@pengutronix.de, stern@rowland.harvard.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 02 Aug 2011 08:33:51 +0000 (UTC) add usb host clock and usb host phy clock to clock tree add usb dummy clocks to clock tree to get rid of adding more cpu_is_mx macros Signed-off-by: Tony Lin --- arch/arm/mach-mxs/clock-mx28.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c index 5dcc59d..3b43c97 100644 --- a/arch/arm/mach-mxs/clock-mx28.c +++ b/arch/arm/mach-mxs/clock-mx28.c @@ -554,6 +554,8 @@ static struct clk rtc_clk = { .parent = &ref_xtal_clk, }; +static struct clk dummy_clk; /* initial to 0 and NULL */ + /* usb_clk gate is controlled in DIGCTRL other than CLKCTRL */ static struct clk usb0_clk = { .enable_reg = DIGCTRL_BASE_ADDR, @@ -571,6 +573,21 @@ static struct clk usb1_clk = { .parent = &pll1_clk, }; +static struct clk usb_phy_clk0 = { + .parent = &pll0_clk, + .enable = _raw_clk_disable, + .disable = _raw_clk_enable, + .enable_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_PLL0CTRL0, + .enable_shift = 18, +}; +/* usb phy clock for usb1 */ +static struct clk usb_phy_clk1 = { + .parent = &pll1_clk, + .enable = _raw_clk_disable, + .disable = _raw_clk_enable, + .enable_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_PLL1CTRL0, + .enable_shift = 18, +}; #define _DEFINE_CLOCK(name, er, es, p) \ static struct clk name = { \ .enable_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_##er, \ @@ -627,8 +644,12 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxs-mmc.1", NULL, ssp1_clk) _REGISTER_CLOCK("flexcan.0", NULL, can0_clk) _REGISTER_CLOCK("flexcan.1", NULL, can1_clk) - _REGISTER_CLOCK(NULL, "usb0", usb0_clk) - _REGISTER_CLOCK(NULL, "usb1", usb1_clk) + _REGISTER_CLOCK("mxc-ehci.0", "usb", usb0_clk) + _REGISTER_CLOCK("mxc-ehci.1", "usb", usb1_clk) + _REGISTER_CLOCK(NULL, "usb0_phy", usb_phy_clk0) + _REGISTER_CLOCK(NULL, "usb1_phy", usb_phy_clk1) + _REGISTER_CLOCK("mxc-ehci.0", "usb_ahb", dummy_clk) + _REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", dummy_clk) _REGISTER_CLOCK("mxs-pwm.0", NULL, pwm_clk) _REGISTER_CLOCK("mxs-pwm.1", NULL, pwm_clk) _REGISTER_CLOCK("mxs-pwm.2", NULL, pwm_clk)