[rfc/rft/patch-v2.6.32-omap1+ 0/2] misc patches

[rfc/rft/patch-v2.6.32-omap1+ 0/2] misc patches

[Felipe Balbi]

The first patch adds omap_udc's clocks to clkdev structures
on the clock*_data.c files, then we will be able to remove
the cpu conditional code when clk_getting.

The second simply adds __initdata to all omap_board_config_kernel
which didn't have the __initdata mark yet, every build was
complaining about section mismatches. I'm not sure, though
whether the lcd drivers can cope with this, the best way
would be to move that to platform_data ASAP and get rid
of the last OMAP_TAG.

Felipe Balbi (2):
  arm: omap: clock: add omap_udc to clkdev
  arm: omap: add missing __initdata to omap_board_config_kernel

 arch/arm/mach-omap1/board-ams-delta.c |    2 +-
 arch/arm/mach-omap1/board-fsample.c   |    2 +-
 arch/arm/mach-omap1/board-innovator.c |    2 +-
 arch/arm/mach-omap1/board-voiceblue.c |    2 +-
 arch/arm/mach-omap1/clock_data.c      |   10 +++++-----
 arch/arm/mach-omap2/board-2430sdp.c   |    2 +-
 arch/arm/mach-omap2/board-apollon.c   |    2 +-
 arch/arm/mach-omap2/board-generic.c   |    2 +-
 arch/arm/mach-omap2/board-h4.c        |    2 +-
 arch/arm/mach-omap2/board-rx51.c      |    2 +-
 arch/arm/mach-omap2/clock2xxx_data.c  |    4 ++--
 11 files changed, 16 insertions(+), 16 deletions(-)

[rfc/rft/patch-v2.6.32-omap1+ 1/2] arm: omap: clock: add omap_udc to clkdev

[Felipe Balbi]

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

[rfc/rft/patch-v2.6.32-omap1+ 2/2] arm: omap: add missing __initdata to omap_board_config_kernel

[Felipe Balbi]

we still need to get rid of the OMAP_TAG_LCD, but while
it's still there, let's kill the section mismatches.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---

Tony, do you think this is the right thing to do now ?
Would the lcd drivers cope with the config being
__initdata ?

 arch/arm/mach-omap1/board-ams-delta.c |    2 +-
 arch/arm/mach-omap1/board-fsample.c   |    2 +-
 arch/arm/mach-omap1/board-innovator.c |    2 +-
 arch/arm/mach-omap1/board-voiceblue.c |    2 +-
 arch/arm/mach-omap2/board-2430sdp.c   |    2 +-
 arch/arm/mach-omap2/board-apollon.c   |    2 +-
 arch/arm/mach-omap2/board-generic.c   |    2 +-
 arch/arm/mach-omap2/board-h4.c        |    2 +-
 arch/arm/mach-omap2/board-rx51.c      |    2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index 7fc11c3..1ceb85a 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -171,7 +171,7 @@ static struct omap_usb_config ams_delta_usb_config __initdata = {
 	.pins[0]	= 2,
 };
 
-static struct omap_board_config_kernel ams_delta_config[] = {
+static struct omap_board_config_kernel ams_delta_config[] __initdata = {
 	{ OMAP_TAG_LCD,		&ams_delta_lcd_config },
 };
 
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index 7e70c3c..9cbf732 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -278,7 +278,7 @@ static struct omap_lcd_config fsample_lcd_config __initdata = {
 	.ctrl_name	= "internal",
 };
 
-static struct omap_board_config_kernel fsample_config[] = {
+static struct omap_board_config_kernel fsample_config[] __initdata = {
 	{ OMAP_TAG_LCD,		&fsample_lcd_config },
 };
 
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index 2133b00..7e3a58a 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -380,7 +380,7 @@ static inline void innovator_mmc_init(void)
 }
 #endif
 
-static struct omap_board_config_kernel innovator_config[] = {
+static struct omap_board_config_kernel innovator_config[] __initdata = {
 	{ OMAP_TAG_LCD,		NULL },
 };
 
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 1691835..fcb3dfa 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -150,7 +150,7 @@ static struct omap_usb_config voiceblue_usb_config __initdata = {
 	.pins[2]	= 6,
 };
 
-static struct omap_board_config_kernel voiceblue_config[] = {
+static struct omap_board_config_kernel voiceblue_config[] __initdata = {
 };
 
 static void __init voiceblue_init_irq(void)
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index e508904..d9bfc35 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -139,7 +139,7 @@ static inline void board_smc91x_init(void)
 
 #endif
 
-static struct omap_board_config_kernel sdp2430_config[] = {
+static struct omap_board_config_kernel sdp2430_config[] __initdata = {
 	{OMAP_TAG_LCD, &sdp2430_lcd_config},
 };
 
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index fbbd68d..58e5fa5 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -269,7 +269,7 @@ static struct omap_lcd_config apollon_lcd_config __initdata = {
 	.ctrl_name	= "internal",
 };
 
-static struct omap_board_config_kernel apollon_config[] = {
+static struct omap_board_config_kernel apollon_config[] __initdata = {
 	{ OMAP_TAG_LCD,		&apollon_lcd_config },
 };
 
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 7e6e6ca..68e219b 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -31,7 +31,7 @@
 #include <plat/board.h>
 #include <plat/common.h>
 
-static struct omap_board_config_kernel generic_config[] = {
+static struct omap_board_config_kernel generic_config[] __initdata = {
 };
 
 static void __init omap_generic_init_irq(void)
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index cfb7f12..6a8decb 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -305,7 +305,7 @@ static struct omap_usb_config h4_usb_config __initdata = {
 #endif
 };
 
-static struct omap_board_config_kernel h4_config[] = {
+static struct omap_board_config_kernel h4_config[] __initdata = {
 	{ OMAP_TAG_LCD,		&h4_lcd_config },
 };
 
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index 67bb347..9adf236 100644
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -49,7 +49,7 @@ static struct omap_fbmem_config rx51_fbmem2_config = {
 	.size = 752 * 1024,
 };
 
-static struct omap_board_config_kernel rx51_config[] = {
+static struct omap_board_config_kernel rx51_config[] __initdata = {
 	{ OMAP_TAG_FBMEM,	&rx51_fbmem0_config },
 	{ OMAP_TAG_FBMEM,	&rx51_fbmem1_config },
 	{ OMAP_TAG_FBMEM,	&rx51_fbmem2_config },
-- 
1.6.6.rc0

Re: [rfc/rft/patch-v2.6.32-omap1+ 2/2] arm: omap: add missing __initdata to omap_board_config_kernel

[Ladislav Michl]

On Wed, Dec 16, 2009 at 11:52:35PM +0200, Felipe Balbi wrote:
> we still need to get rid of the OMAP_TAG_LCD, but while
> it's still there, let's kill the section mismatches.

Hmm, couldn't we just simply remove all empty declarations first? As data section
is zeroed it should not cause any harm. Anyway, patch bellow is entirely untested
and posted for your convenience only :-)

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>

diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c
index e1195a3..bea32cf 100644
--- a/arch/arm/mach-omap1/board-generic.c
+++ b/arch/arm/mach-omap1/board-generic.c
@@ -57,9 +57,6 @@ static struct omap_usb_config generic1610_usb_config __initdata = {
 };
 #endif
 
-static struct omap_board_config_kernel generic_config[] __initdata = {
-};
-
 static void __init omap_generic_init(void)
 {
 #ifdef CONFIG_ARCH_OMAP15XX
@@ -80,9 +77,6 @@ static void __init omap_generic_init(void)
 		omap_usb_init(&generic1610_usb_config);
 	}
 #endif
-
-	omap_board_config = generic_config;
-	omap_board_config_size = ARRAY_SIZE(generic_config);
 	omap_serial_init();
 	omap_register_i2c_bus(1, 100, NULL, 0);
 }
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 1691835..5a95391 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -150,9 +150,6 @@ static struct omap_usb_config voiceblue_usb_config __initdata = {
 	.pins[2]	= 6,
 };
 
-static struct omap_board_config_kernel voiceblue_config[] = {
-};
-
 static void __init voiceblue_init_irq(void)
 {
 	omap1_init_common_hw();
@@ -194,8 +191,6 @@ static void __init voiceblue_init(void)
 	set_irq_type(gpio_to_irq(15), IRQ_TYPE_EDGE_RISING);
 
 	platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices));
-	omap_board_config = voiceblue_config;
-	omap_board_config_size = ARRAY_SIZE(voiceblue_config);
 	omap_serial_init();
 	omap_usb_init(&voiceblue_usb_config);
 	omap_register_i2c_bus(1, 100, NULL, 0);
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index c90b0d0..4bfd8e3 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -298,13 +298,8 @@ static struct platform_device *sdp3430_devices[] __initdata = {
 	&sdp3430_dss_device,
 };
 
-static struct omap_board_config_kernel sdp3430_config[] __initdata = {
-};
-
 static void __init omap_3430sdp_init_irq(void)
 {
-	omap_board_config = sdp3430_config;
-	omap_board_config_size = ARRAY_SIZE(sdp3430_config);
 	omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);
 	omap_init_irq();
 	omap_gpio_init();
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c
index 7390596..f460d4f 100755
--- a/arch/arm/mach-omap2/board-3630sdp.c
+++ b/arch/arm/mach-omap2/board-3630sdp.c
@@ -72,13 +72,8 @@ static void __init omap_sdp_map_io(void)
 	omap2_map_common_io();
 }
 
-static struct omap_board_config_kernel sdp_config[] __initdata = {
-};
-
 static void __init omap_sdp_init_irq(void)
 {
-	omap_board_config = sdp_config;
-	omap_board_config_size = ARRAY_SIZE(sdp_config);
 	omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,
 			h8mbx00u0mer0em_sdrc_params);
 	omap_init_irq();
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index b4e6eca..c16cb3f 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -35,17 +35,11 @@
 /*
  * Board initialization
  */
-static struct omap_board_config_kernel am3517_evm_config[] __initdata = {
-};
-
 static struct platform_device *am3517_evm_devices[] __initdata = {
 };
 
 static void __init am3517_evm_init_irq(void)
 {
-	omap_board_config = am3517_evm_config;
-	omap_board_config_size = ARRAY_SIZE(am3517_evm_config);
-
 	omap2_init_common_hw(NULL, NULL);
 	omap_init_irq();
 	omap_gpio_init();
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 2626a9f..3ec2687 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -462,14 +462,8 @@ static void __init cm_t35_init_i2c(void)
 			      ARRAY_SIZE(cm_t35_i2c_boardinfo));
 }
 
-static struct omap_board_config_kernel cm_t35_config[] __initdata = {
-};
-
 static void __init cm_t35_init_irq(void)
 {
-	omap_board_config = cm_t35_config;
-	omap_board_config_size = ARRAY_SIZE(cm_t35_config);
-
 	omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
 			     mt46h32m32lf6_sdrc_params);
 	omap_init_irq();
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 7e6e6ca..cad8b9c 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -31,13 +31,8 @@
 #include <plat/board.h>
 #include <plat/common.h>
 
-static struct omap_board_config_kernel generic_config[] = {
-};
-
 static void __init omap_generic_init_irq(void)
 {
-	omap_board_config = generic_config;
-	omap_board_config_size = ARRAY_SIZE(generic_config);
 	omap2_init_common_hw(NULL, NULL);
 	omap_init_irq();
 }
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 117b8fd..c38fed2 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -99,9 +99,6 @@ static inline void __init igep2_init_smsc911x(void)
 static inline void __init igep2_init_smsc911x(void) { }
 #endif
 
-static struct omap_board_config_kernel igep2_config[] __initdata = {
-};
-
 static struct regulator_consumer_supply igep2_vmmc1_supply = {
 	.supply		= "vmmc",
 };
@@ -166,8 +163,6 @@ static struct twl4030_usb_data igep2_usb_data = {
 
 static void __init igep2_init_irq(void)
 {
-	omap_board_config = igep2_config;
-	omap_board_config_size = ARRAY_SIZE(igep2_config);
 	omap2_init_common_hw(NULL, NULL);
 	omap_init_irq();
 	omap_gpio_init();
diff --git a/arch/arm/mach-omap2/board-zoom3.c b/arch/arm/mach-omap2/board-zoom3.c
index a9fe918..84e193c 100644
--- a/arch/arm/mach-omap2/board-zoom3.c
+++ b/arch/arm/mach-omap2/board-zoom3.c
@@ -30,13 +30,8 @@ static void __init omap_zoom_map_io(void)
 	omap2_map_common_io();
 }
 
-static struct omap_board_config_kernel zoom_config[] __initdata = {
-};
-
 static void __init omap_zoom_init_irq(void)
 {
-	omap_board_config = zoom_config;
-	omap_board_config_size = ARRAY_SIZE(zoom_config);
 	omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,
 			h8mbx00u0mer0em_sdrc_params);
 	omap_init_irq();

Re: [rfc/rft/patch-v2.6.32-omap1+ 1/2] arm: omap: clock: add omap_udc to clkdev

[Paul Walmsley]

Hi Felipe,

On Wed, 16 Dec 2009, Felipe Balbi wrote:

> 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.

I guess these can also be used by ohci-omap.c ?

> 
> 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
> 


- Paul

Re: [rfc/rft/patch-v2.6.32-omap1+ 1/2] arm: omap: clock: add omap_udc to clkdev

[Felipe Balbi]

On Fri, Dec 18, 2009 at 03:05:09AM +0100, ext Paul Walmsley wrote:
>Hi Felipe,
>
>On Wed, 16 Dec 2009, Felipe Balbi wrote:
>
>> 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.
>
>I guess these can also be used by ohci-omap.c ?

in that case do we add two CLK() entries ?

-- 
balbi

Re: [rfc/rft/patch-v2.6.32-omap1+ 2/2] arm: omap: add missing __initdata to omap_board_config_kernel

[Tony Lindgren]

Tomi,

* Ladislav Michl <Ladislav.Michl@seznam.cz> [091216 14:40]:
> On Wed, Dec 16, 2009 at 11:52:35PM +0200, Felipe Balbi wrote:
> > we still need to get rid of the OMAP_TAG_LCD, but while
> > it's still there, let's kill the section mismatches.
> 
> Hmm, couldn't we just simply remove all empty declarations first? As data section
> is zeroed it should not cause any harm. Anyway, patch bellow is entirely untested
> and posted for your convenience only :-)

Can you please queue this (and any other fb/dss related board fixes) into your 
dss fixes queue?
 
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>

Acked-by: Tony Lindgren <tony@atomide.com>

 
> diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c
> index e1195a3..bea32cf 100644
> --- a/arch/arm/mach-omap1/board-generic.c
> +++ b/arch/arm/mach-omap1/board-generic.c
> @@ -57,9 +57,6 @@ static struct omap_usb_config generic1610_usb_config __initdata = {
>  };
>  #endif
>  
> -static struct omap_board_config_kernel generic_config[] __initdata = {
> -};
> -
>  static void __init omap_generic_init(void)
>  {
>  #ifdef CONFIG_ARCH_OMAP15XX
> @@ -80,9 +77,6 @@ static void __init omap_generic_init(void)
>  		omap_usb_init(&generic1610_usb_config);
>  	}
>  #endif
> -
> -	omap_board_config = generic_config;
> -	omap_board_config_size = ARRAY_SIZE(generic_config);
>  	omap_serial_init();
>  	omap_register_i2c_bus(1, 100, NULL, 0);
>  }
> diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
> index 1691835..5a95391 100644
> --- a/arch/arm/mach-omap1/board-voiceblue.c
> +++ b/arch/arm/mach-omap1/board-voiceblue.c
> @@ -150,9 +150,6 @@ static struct omap_usb_config voiceblue_usb_config __initdata = {
>  	.pins[2]	= 6,
>  };
>  
> -static struct omap_board_config_kernel voiceblue_config[] = {
> -};
> -
>  static void __init voiceblue_init_irq(void)
>  {
>  	omap1_init_common_hw();
> @@ -194,8 +191,6 @@ static void __init voiceblue_init(void)
>  	set_irq_type(gpio_to_irq(15), IRQ_TYPE_EDGE_RISING);
>  
>  	platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices));
> -	omap_board_config = voiceblue_config;
> -	omap_board_config_size = ARRAY_SIZE(voiceblue_config);
>  	omap_serial_init();
>  	omap_usb_init(&voiceblue_usb_config);
>  	omap_register_i2c_bus(1, 100, NULL, 0);
> diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
> index c90b0d0..4bfd8e3 100644
> --- a/arch/arm/mach-omap2/board-3430sdp.c
> +++ b/arch/arm/mach-omap2/board-3430sdp.c
> @@ -298,13 +298,8 @@ static struct platform_device *sdp3430_devices[] __initdata = {
>  	&sdp3430_dss_device,
>  };
>  
> -static struct omap_board_config_kernel sdp3430_config[] __initdata = {
> -};
> -
>  static void __init omap_3430sdp_init_irq(void)
>  {
> -	omap_board_config = sdp3430_config;
> -	omap_board_config_size = ARRAY_SIZE(sdp3430_config);
>  	omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);
>  	omap_init_irq();
>  	omap_gpio_init();
> diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c
> index 7390596..f460d4f 100755
> --- a/arch/arm/mach-omap2/board-3630sdp.c
> +++ b/arch/arm/mach-omap2/board-3630sdp.c
> @@ -72,13 +72,8 @@ static void __init omap_sdp_map_io(void)
>  	omap2_map_common_io();
>  }
>  
> -static struct omap_board_config_kernel sdp_config[] __initdata = {
> -};
> -
>  static void __init omap_sdp_init_irq(void)
>  {
> -	omap_board_config = sdp_config;
> -	omap_board_config_size = ARRAY_SIZE(sdp_config);
>  	omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,
>  			h8mbx00u0mer0em_sdrc_params);
>  	omap_init_irq();
> diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
> index b4e6eca..c16cb3f 100644
> --- a/arch/arm/mach-omap2/board-am3517evm.c
> +++ b/arch/arm/mach-omap2/board-am3517evm.c
> @@ -35,17 +35,11 @@
>  /*
>   * Board initialization
>   */
> -static struct omap_board_config_kernel am3517_evm_config[] __initdata = {
> -};
> -
>  static struct platform_device *am3517_evm_devices[] __initdata = {
>  };
>  
>  static void __init am3517_evm_init_irq(void)
>  {
> -	omap_board_config = am3517_evm_config;
> -	omap_board_config_size = ARRAY_SIZE(am3517_evm_config);
> -
>  	omap2_init_common_hw(NULL, NULL);
>  	omap_init_irq();
>  	omap_gpio_init();
> diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
> index 2626a9f..3ec2687 100644
> --- a/arch/arm/mach-omap2/board-cm-t35.c
> +++ b/arch/arm/mach-omap2/board-cm-t35.c
> @@ -462,14 +462,8 @@ static void __init cm_t35_init_i2c(void)
>  			      ARRAY_SIZE(cm_t35_i2c_boardinfo));
>  }
>  
> -static struct omap_board_config_kernel cm_t35_config[] __initdata = {
> -};
> -
>  static void __init cm_t35_init_irq(void)
>  {
> -	omap_board_config = cm_t35_config;
> -	omap_board_config_size = ARRAY_SIZE(cm_t35_config);
> -
>  	omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
>  			     mt46h32m32lf6_sdrc_params);
>  	omap_init_irq();
> diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
> index 7e6e6ca..cad8b9c 100644
> --- a/arch/arm/mach-omap2/board-generic.c
> +++ b/arch/arm/mach-omap2/board-generic.c
> @@ -31,13 +31,8 @@
>  #include <plat/board.h>
>  #include <plat/common.h>
>  
> -static struct omap_board_config_kernel generic_config[] = {
> -};
> -
>  static void __init omap_generic_init_irq(void)
>  {
> -	omap_board_config = generic_config;
> -	omap_board_config_size = ARRAY_SIZE(generic_config);
>  	omap2_init_common_hw(NULL, NULL);
>  	omap_init_irq();
>  }
> diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
> index 117b8fd..c38fed2 100644
> --- a/arch/arm/mach-omap2/board-igep0020.c
> +++ b/arch/arm/mach-omap2/board-igep0020.c
> @@ -99,9 +99,6 @@ static inline void __init igep2_init_smsc911x(void)
>  static inline void __init igep2_init_smsc911x(void) { }
>  #endif
>  
> -static struct omap_board_config_kernel igep2_config[] __initdata = {
> -};
> -
>  static struct regulator_consumer_supply igep2_vmmc1_supply = {
>  	.supply		= "vmmc",
>  };
> @@ -166,8 +163,6 @@ static struct twl4030_usb_data igep2_usb_data = {
>  
>  static void __init igep2_init_irq(void)
>  {
> -	omap_board_config = igep2_config;
> -	omap_board_config_size = ARRAY_SIZE(igep2_config);
>  	omap2_init_common_hw(NULL, NULL);
>  	omap_init_irq();
>  	omap_gpio_init();
> diff --git a/arch/arm/mach-omap2/board-zoom3.c b/arch/arm/mach-omap2/board-zoom3.c
> index a9fe918..84e193c 100644
> --- a/arch/arm/mach-omap2/board-zoom3.c
> +++ b/arch/arm/mach-omap2/board-zoom3.c
> @@ -30,13 +30,8 @@ static void __init omap_zoom_map_io(void)
>  	omap2_map_common_io();
>  }
>  
> -static struct omap_board_config_kernel zoom_config[] __initdata = {
> -};
> -
>  static void __init omap_zoom_init_irq(void)
>  {
> -	omap_board_config = zoom_config;
> -	omap_board_config_size = ARRAY_SIZE(zoom_config);
>  	omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,
>  			h8mbx00u0mer0em_sdrc_params);
>  	omap_init_irq();
> 

[APPLIED] [rfc/rft/patch-v2.6.32-omap1+ 2/2] arm: omap: add missing

[Tony Lindgren]

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: for-next

Initial commit ID (Likely to change): 04d0f7111fc777ba8c5f37960f31b17d796594a8

PatchWorks
http://patchwork.kernel.org/patch/68460/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=04d0f7111fc777ba8c5f37960f31b17d796594a8

Re: [_NOT_ APPLIED] [rfc/rft/patch-v2.6.32-omap1+ 2/2] arm: omap: add missing

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [100106 16:47]:
> This patch has been applied to the linux-omap

Oops, sorry, accident. Not applying this one, I'll
let Tomi queue with all the fb/dss2 patches.

Regards,

Tony

Re: [rfc/rft/patch-v2.6.32-omap1+ 2/2] arm: omap: add missing __initdata to omap_board_config_kernel

[Tomi Valkeinen]

On Wed, 2010-01-06 at 00:44 +0100, ext Tony Lindgren wrote:
> Tomi,
> 
> * Ladislav Michl <Ladislav.Michl@seznam.cz> [091216 14:40]:
> > On Wed, Dec 16, 2009 at 11:52:35PM +0200, Felipe Balbi wrote:
> > > we still need to get rid of the OMAP_TAG_LCD, but while
> > > it's still there, let's kill the section mismatches.
> > 
> > Hmm, couldn't we just simply remove all empty declarations first? As data section
> > is zeroed it should not cause any harm. Anyway, patch bellow is entirely untested
> > and posted for your convenience only :-)
> 
> Can you please queue this (and any other fb/dss related board fixes) into your 
> dss fixes queue?

Yes, I can take this. Some board changes will cause headaches, as they
depend on patches in linux-omap, but not in linux. But I guess I'll
manage =).

 Tomi

Re: [rfc/rft/patch-v2.6.32-omap1+ 2/2] arm: omap: add missing __initdata to omap_board_config_kernel

[Tony Lindgren]

* Tomi Valkeinen <tomi.valkeinen@nokia.com> [100107 03:29]:
> On Wed, 2010-01-06 at 00:44 +0100, ext Tony Lindgren wrote:
> > Tomi,
> > 
> > * Ladislav Michl <Ladislav.Michl@seznam.cz> [091216 14:40]:
> > > On Wed, Dec 16, 2009 at 11:52:35PM +0200, Felipe Balbi wrote:
> > > > we still need to get rid of the OMAP_TAG_LCD, but while
> > > > it's still there, let's kill the section mismatches.
> > > 
> > > Hmm, couldn't we just simply remove all empty declarations first? As data section
> > > is zeroed it should not cause any harm. Anyway, patch bellow is entirely untested
> > > and posted for your convenience only :-)
> > 
> > Can you please queue this (and any other fb/dss related board fixes) into your 
> > dss fixes queue?
> 
> Yes, I can take this. Some board changes will cause headaches, as they
> depend on patches in linux-omap, but not in linux. But I guess I'll
> manage =).

Yeah it's always a bit of a pain with the board changes.. Anyways,
if there are some conflict areas, let's try get those patched
away ASAP to remove the dependencies.

Regards,

Tony