misc patches

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

Cc Paul Walmsley <[email protected]>

Signed-off-by Felipe Balbi <[email protected]>

---

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

arch/arm/mach-omap1/clock_data.c +5 -5

index ab995a9..72169e7 100644
@@ -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),

arch/arm/mach-omap2/clock2xxx_data.c +2 -2

index 97dc7cf..c21bf7c 100644
@@ -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),

Signature · 1 line

1.6.6.rc0

Hi Felipe,

Quoted 7 lines · Felipe Balbi

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

Cc Paul Walmsley <[email protected]>

Signed-off-by Felipe Balbi <[email protected]>

---

Quoted 3 lines

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 ?

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

Quoted 2 lines · 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.

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 <[email protected]>

arch/arm/mach-omap1/board-generic.c +0 -6

index e1195a3..bea32cf 100644
@@ -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);
 }

arch/arm/mach-omap1/board-voiceblue.c +0 -5

index 1691835..5a95391 100644
@@ -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);

arch/arm/mach-omap2/board-3430sdp.c +0 -5

index c90b0d0..4bfd8e3 100644
@@ -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();

arch/arm/mach-omap2/board-3630sdp.c +0 -5

index 7390596..f460d4f 100755
@@ -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();

arch/arm/mach-omap2/board-am3517evm.c +0 -6

index b4e6eca..c16cb3f 100644
@@ -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();

arch/arm/mach-omap2/board-cm-t35.c +0 -6

index 2626a9f..3ec2687 100644
@@ -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();

arch/arm/mach-omap2/board-generic.c +0 -5

index 7e6e6ca..cad8b9c 100644
@@ -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();
 }

arch/arm/mach-omap2/board-igep0020.c +0 -5

index 117b8fd..c38fed2 100644
@@ -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();

arch/arm/mach-omap2/board-zoom3.c +0 -5

index a9fe918..84e193c 100644
@@ -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();

Tomi,

Quoted 4 lines · Ladislav Michl

Quoted 2 lines · 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.

Quoted 3 lines

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?

Quoted 11 lines · ext Tony Lindgren

Tomi,

Quoted 7 lines · Ladislav Michl

Quoted 2 lines · 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.

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

Quoted 2 lines

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

This patch has been applied to the linux-omap