From patchwork Mon Mar 16 22:42:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 12500 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2GMh87O028772 for ; Mon, 16 Mar 2009 22:43:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752373AbZCPWmx (ORCPT ); Mon, 16 Mar 2009 18:42:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755264AbZCPWmw (ORCPT ); Mon, 16 Mar 2009 18:42:52 -0400 Received: from mho-01-bos.mailhop.org ([63.208.196.178]:51361 "EHLO mho-01-bos.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752373AbZCPWmw (ORCPT ); Mon, 16 Mar 2009 18:42:52 -0400 Received: from c-69-181-40-92.hsd1.ca.comcast.net ([69.181.40.92] helo=localhost.localdomain) by mho-01-bos.mailhop.org with esmtpa (Exim 4.68) (envelope-from ) id 1LjLW4-000Cjm-8s; Mon, 16 Mar 2009 22:42:40 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 69.181.40.92 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX188qDveUeTI/xk649V16K6F Date: Mon, 16 Mar 2009 15:42:44 -0700 From: Tony Lindgren To: Russell King Cc: David Brownell , linux-arm-kernel@lists.arm.linux.org.uk, Ajay Kumar Gupta , Felipe Balbi , linux-omap@vger.kernel.org Subject: [PATCH] ARM: OMAP: Add name for musb clocks Message-ID: <20090316224243.GO19229@atomide.com> References: <20090310205824.16425.97745.stgit@localhost> <20090310211628.16425.55120.stgit@localhost> <20090315161446.GG10786@n2100.arm.linux.org.uk> <200903151146.02132.david-b@pacbell.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <200903151146.02132.david-b@pacbell.net> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org * David Brownell [090315 11:46]: > On Sunday 15 March 2009, Russell King - ARM Linux wrote: > > clkdev removes the need for this sort of crap. > > And once it, or its equivalent, works on all the platforms > supportihg the musb_hdrc driver, then the driver can switch. Yeah, I added a REVISIT comment to remove the "ick" name in the low-level init code once all the musb platforms use clkdev. Russell, here's a patch you might want to merge into your omap-clks3 branch for musb. Also tested musb on omap-clks3 + omap-upstream + omap3-upstream + omap3-boards patches. Regards, Tony From 8fb4be02dd5fdbcf71708d7cb5d42751aee42190 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 16 Mar 2009 15:28:41 -0700 Subject: [PATCH] ARM: OMAP: Add name for musb clocks This allows musb_core.c to register clock with name "ick". Once all the platforms using the musb driver have been converted to use clockdev, the clock name does not need to be passed from the low-level init code. Signed-off-by: Tony Lindgren diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index 1e839c5..f58ad06 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c @@ -205,7 +205,7 @@ static struct omap_clk omap24xx_clks[] = { CLK(NULL, "aes_ick", &aes_ick, CK_243X | CK_242X), CLK(NULL, "pka_ick", &pka_ick, CK_243X | CK_242X), CLK(NULL, "usb_fck", &usb_fck, CK_243X | CK_242X), - CLK(NULL, "usbhs_ick", &usbhs_ick, CK_243X), + CLK("musb_hdrc", "ick", &usbhs_ick, CK_243X), CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_243X), CLK("mmci-omap-hs.0", "fck", &mmchs1_fck, CK_243X), CLK("mmci-omap-hs.1", "ick", &mmchs2_ick, CK_243X), diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index 0a14dca..a057539 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c @@ -157,7 +157,7 @@ static struct omap_clk omap34xx_clks[] = { CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck, CK_343X), CLK(NULL, "ssi_sst_fck", &ssi_sst_fck, CK_343X), CLK(NULL, "core_l3_ick", &core_l3_ick, CK_343X), - CLK(NULL, "hsotgusb_ick", &hsotgusb_ick, CK_343X), + CLK("musb_hdrc", "ick", &hsotgusb_ick, CK_343X), CLK(NULL, "sdrc_ick", &sdrc_ick, CK_343X), CLK(NULL, "gpmc_fck", &gpmc_fck, CK_343X), CLK(NULL, "security_l3_ick", &security_l3_ick, CK_343X),