All of lore.kernel.org
 help / color / mirror / Atom feed
From: Felipe Balbi <felipe.balbi@nokia.com>
To: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org, Paul Walmsley <paul@pwsan.com>,
	Kevin Hilman <kjh@hilman.org>,
	Felipe Balbi <felipe.balbi@nokia.com>
Subject: [rfc/rft/patch-v2.6.32-omap1+ 1/2] arm: omap: clock: add omap_udc to clkdev
Date: Wed, 16 Dec 2009 23:52:34 +0200	[thread overview]
Message-ID: <1261000355-2174-2-git-send-email-felipe.balbi@nokia.com> (raw)
In-Reply-To: <1261000355-2174-1-git-send-email-felipe.balbi@nokia.com>

then we can later remove all of those cpu conditionals
on drivers/usb/gadget/omap_udc.c

Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---

Paul, do you think the following is correct ? Judging
by omap_udc.c those are the clocks used by that driver
but I don't have boards to try out.

Anyways, after this patch hits mainline, I can send
patches to omap_udc.c removing the cpu conditional
clk_get().

 arch/arm/mach-omap1/clock_data.c     |   10 +++++-----
 arch/arm/mach-omap2/clock2xxx_data.c |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
index ab995a9..72169e7 100644
--- a/arch/arm/mach-omap1/clock_data.c
+++ b/arch/arm/mach-omap1/clock_data.c
@@ -622,7 +622,7 @@ static struct omap_clk omap_clks[] = {
 	/* CK_GEN3 clocks */
 	CLK(NULL,	"tc_ck",	&tc_ck.clk,	CK_16XX | CK_1510 | CK_310 | CK_7XX),
 	CLK(NULL,	"tipb_ck",	&tipb_ck,	CK_1510 | CK_310),
-	CLK(NULL,	"l3_ocpi_ck",	&l3_ocpi_ck,	CK_16XX | CK_7XX),
+	CLK("omap_udc",	"l3_ocpi_ck",	&l3_ocpi_ck,	CK_16XX | CK_7XX),
 	CLK(NULL,	"tc1_ck",	&tc1_ck,	CK_16XX),
 	CLK(NULL,	"tc2_ck",	&tc2_ck,	CK_16XX),
 	CLK(NULL,	"dma_ck",	&dma_ck,	CK_16XX | CK_1510 | CK_310),
@@ -640,10 +640,10 @@ static struct omap_clk omap_clks[] = {
 	CLK(NULL,	"uart3_ck",	&uart3_1510,	CK_1510 | CK_310),
 	CLK(NULL,	"uart3_ck",	&uart3_16xx.clk, CK_16XX),
 	CLK(NULL,	"usb_clko",	&usb_clko,	CK_16XX | CK_1510 | CK_310),
-	CLK(NULL,	"usb_hhc_ck",	&usb_hhc_ck1510, CK_1510 | CK_310),
-	CLK(NULL,	"usb_hhc_ck",	&usb_hhc_ck16xx, CK_16XX),
-	CLK(NULL,	"usb_dc_ck",	&usb_dc_ck,	CK_16XX),
-	CLK(NULL,	"usb_dc_ck",	&usb_dc_ck7xx,	CK_7XX),
+	CLK("omap_udc",	"usb_hhc_ck",	&usb_hhc_ck1510, CK_1510 | CK_310),
+	CLK("omap_hdc",	"usb_hhc_ck",	&usb_hhc_ck16xx, CK_16XX),
+	CLK("omap_udc",	"usb_dc_ck",	&usb_dc_ck,	CK_16XX),
+	CLK("omap_udc",	"usb_dc_ck",	&usb_dc_ck7xx,	CK_7XX),
 	CLK(NULL,	"mclk",		&mclk_1510,	CK_1510 | CK_310),
 	CLK(NULL,	"mclk",		&mclk_16xx,	CK_16XX),
 	CLK(NULL,	"bclk",		&bclk_1510,	CK_1510 | CK_310),
diff --git a/arch/arm/mach-omap2/clock2xxx_data.c b/arch/arm/mach-omap2/clock2xxx_data.c
index 97dc7cf..c21bf7c 100644
--- a/arch/arm/mach-omap2/clock2xxx_data.c
+++ b/arch/arm/mach-omap2/clock2xxx_data.c
@@ -2126,7 +2126,7 @@ static struct omap_clk omap24xx_clks[] = {
 	/* L3 domain clocks */
 	CLK(NULL,	"core_l3_ck",	&core_l3_ck,	CK_243X | CK_242X),
 	CLK(NULL,	"ssi_fck",	&ssi_ssr_sst_fck, CK_243X | CK_242X),
-	CLK(NULL,	"usb_l4_ick",	&usb_l4_ick,	CK_243X | CK_242X),
+	CLK("omap_udc",	"usb_l4_ick",	&usb_l4_ick,	CK_243X | CK_242X),
 	/* L4 domain clocks */
 	CLK(NULL,	"l4_ck",	&l4_ck,		CK_243X | CK_242X),
 	CLK(NULL,	"ssi_l4_ick",	&ssi_l4_ick,	CK_243X | CK_242X),
@@ -2221,7 +2221,7 @@ static struct omap_clk omap24xx_clks[] = {
 	CLK("omap_rng",	"ick",		&rng_ick,	CK_243X | CK_242X),
 	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("omap_udc",	"usb_fck",	&usb_fck,	CK_243X | CK_242X),
 	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),
-- 
1.6.6.rc0


  reply	other threads:[~2009-12-16 21:55 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-16 21:52 [rfc/rft/patch-v2.6.32-omap1+ 0/2] misc patches Felipe Balbi
2009-12-16 21:52 ` Felipe Balbi [this message]
2009-12-18  2:05   ` [rfc/rft/patch-v2.6.32-omap1+ 1/2] arm: omap: clock: add omap_udc to clkdev Paul Walmsley
2009-12-21  7:05     ` Felipe Balbi
2009-12-16 21:52 ` [rfc/rft/patch-v2.6.32-omap1+ 2/2] arm: omap: add missing __initdata to omap_board_config_kernel Felipe Balbi
2009-12-16 23:41   ` Ladislav Michl
2010-01-05 23:44     ` Tony Lindgren
2010-01-07 11:29       ` Tomi Valkeinen
2010-01-07 18:54         ` Tony Lindgren
2010-01-07  0:49     ` [APPLIED] [rfc/rft/patch-v2.6.32-omap1+ 2/2] arm: omap: add missing Tony Lindgren
2010-01-07  0:53       ` [_NOT_ APPLIED] " Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1261000355-2174-2-git-send-email-felipe.balbi@nokia.com \
    --to=felipe.balbi@nokia.com \
    --cc=kjh@hilman.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=paul@pwsan.com \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.