From patchwork Wed Jul 27 05:29:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lin X-Patchwork-Id: 106979 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 36BB0B6F8B for ; Wed, 27 Jul 2011 15:25:42 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qlwcc-00026v-22; Wed, 27 Jul 2011 05:25:30 +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 1Qlwcb-0007pu-EP; Wed, 27 Jul 2011 05:25:29 +0000 Received: from am1ehsobe002.messaging.microsoft.com ([213.199.154.205] helo=AM1EHSOBE002.bigfish.com) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QlwcT-0007nI-U6 for linux-arm-kernel@lists.infradead.org; Wed, 27 Jul 2011 05:25:22 +0000 Received: from mail45-am1-R.bigfish.com (10.3.201.254) by AM1EHSOBE002.bigfish.com (10.3.204.22) with Microsoft SMTP Server id 14.1.225.22; Wed, 27 Jul 2011 05:25:18 +0000 Received: from mail45-am1 (localhost.localdomain [127.0.0.1]) by mail45-am1-R.bigfish.com (Postfix) with ESMTP id 982B612000B3; Wed, 27 Jul 2011 05:25:18 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail45-am1 (localhost.localdomain [127.0.0.1]) by mail45-am1 (MessageSwitch) id 1311744297826990_30428; Wed, 27 Jul 2011 05:24:57 +0000 (UTC) Received: from AM1EHSMHS005.bigfish.com (unknown [10.3.201.254]) by mail45-am1.bigfish.com (Postfix) with ESMTP id C9CAC13C00A6; Wed, 27 Jul 2011 05:24:08 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by AM1EHSMHS005.bigfish.com (10.3.207.105) with Microsoft SMTP Server (TLS) id 14.1.225.22; Wed, 27 Jul 2011 05:24:08 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.289.8; Wed, 27 Jul 2011 00:24:07 -0500 Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p6R5NxPC008821; Wed, 27 Jul 2011 00:24:06 -0500 (CDT) From: Tony Lin To: Subject: [PATCH v3 3/6] ARM: mxs: add usb clocks to clock tree Date: Wed, 27 Jul 2011 13:29:31 +0800 Message-ID: <1311744574-3610-4-git-send-email-tony.lin@freescale.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1311744574-3610-1-git-send-email-tony.lin@freescale.com> References: <1311744574-3610-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-20110727_012522_196771_49BDAF78 X-CRM114-Status: GOOD ( 14.87 ) 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.205 listed in list.dnswl.org] Cc: koen.beel.barco@gmail.com, stern@rowland.harvard.edu, s.hauer@pengutronix.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org 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 | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c index 5dcc59d..0afc98f 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,14 @@ static struct clk usb1_clk = { .parent = &pll1_clk, }; +/* 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 +637,10 @@ 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", "usb1", usb1_clk) + _REGISTER_CLOCK("mxc-ehci", "usb1_phy", usb_phy_clk1) + _REGISTER_CLOCK("mxc-ehci", "usb", dummy_clk) + _REGISTER_CLOCK("mxc-ehci", "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)