ARM: OMAP2: use early init hook

PATCH New Russell King - ARM Linux 5 participants 27 messages Jan 23, 2011 – Feb 16, 2011

Subsystems (5)

Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape OMAP2+ support +1 more subsystems

lore

Share & tools

lore

Russell King - ARM Linux

author

2011-01-23 17:13 UTC #0 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

Move non-mapping and non-irq initialization code out of .map_io and .init_irq respectively into the new init_early hook.

Signed-off-by Russell King <[email protected]>

---
I think I've updated this patch correctly for the new platforms merged into mainline.

Please ensure that new platforms merged after this patch also use the new structure, and note that the initializers should be listed in the following order:

	.fixup
	.reserve
	.map_io
	.init_early
	.init_irq
	.timer
	.init_machine

This is the order in which they are called, so it helps to make sense when reading the board level code if they're arranged in called order.

 arch/arm/mach-omap2/board-2430sdp.c        |    8 ++++----
 arch/arm/mach-omap2/board-3430sdp.c        |    8 ++++----
 arch/arm/mach-omap2/board-3630sdp.c        |    8 ++++----
 arch/arm/mach-omap2/board-4430sdp.c        |    8 ++++----
 arch/arm/mach-omap2/board-am3517crane.c    |    8 ++++----
 arch/arm/mach-omap2/board-am3517evm.c      |    8 ++++----
 arch/arm/mach-omap2/board-apollon.c        |    8 ++++----
 arch/arm/mach-omap2/board-cm-t35.c         |    8 ++++----
 arch/arm/mach-omap2/board-cm-t3517.c       |    8 ++++----
 arch/arm/mach-omap2/board-devkit8000.c     |    9 +++++++--
 arch/arm/mach-omap2/board-generic.c        |    8 ++++----
 arch/arm/mach-omap2/board-h4.c             |    9 +++++++--
 arch/arm/mach-omap2/board-igep0020.c       |    8 ++++----
 arch/arm/mach-omap2/board-igep0030.c       |    6 +++---
 arch/arm/mach-omap2/board-ldp.c            |    8 ++++----
 arch/arm/mach-omap2/board-n8x0.c           |   18 ++++++++++--------
 arch/arm/mach-omap2/board-omap3beagle.c    |    9 +++++++--
 arch/arm/mach-omap2/board-omap3evm.c       |    8 ++++----
 arch/arm/mach-omap2/board-omap3logic.c     |    9 +++++----
 arch/arm/mach-omap2/board-omap3pandora.c   |    8 ++++----
 arch/arm/mach-omap2/board-omap3stalker.c   |    7 ++++++-
 arch/arm/mach-omap2/board-omap3touchbook.c |    9 +++++++--
 arch/arm/mach-omap2/board-omap4panda.c     |    6 +++---
 arch/arm/mach-omap2/board-overo.c          |    8 ++++----
 arch/arm/mach-omap2/board-rm680.c          |    8 ++++----
 arch/arm/mach-omap2/board-rx51.c           |    8 ++++----
 arch/arm/mach-omap2/board-zoom.c           |   14 +++++++-------
 27 files changed, 130 insertions(+), 102 deletions(-)

arch/arm/mach-omap2/board-2430sdp.c +4 -4

index e066177..ec74c0f 100644
@@ -139,13 +139,12 @@ static struct omap_board_config_kernel sdp2430_config[] __initdata = {
 	{OMAP_TAG_LCD, &sdp2430_lcd_config},
 };
 
-static void __init omap_2430sdp_init_irq(void)
+static void __init omap_2430sdp_init_early(void)
 {
 	omap_board_config = sdp2430_config;
 	omap_board_config_size = ARRAY_SIZE(sdp2430_config);
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(NULL, NULL);
-	omap_init_irq();
 }
 
 static struct twl4030_gpio_platform_data sdp2430_gpio_data = {

@@ -253,9 +252,10 @@ static void __init omap_2430sdp_map_io(void)
 MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")
 	/* Maintainer: Syed Khasim - Texas Instruments Inc */
 	.boot_params	= 0x80000100,
-	.map_io		= omap_2430sdp_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= omap_2430sdp_init_irq,
+	.map_io		= omap_2430sdp_map_io,
+	.init_early	= omap_2430sdp_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= omap_2430sdp_init,
 	.timer		= &omap_timer,
 MACHINE_END

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

index d4e41ef..3108588 100644
@@ -327,14 +327,13 @@ static struct platform_device *sdp3430_devices[] __initdata = {
 static struct omap_board_config_kernel sdp3430_config[] __initdata = {
 };
 
-static void __init omap_3430sdp_init_irq(void)
+static void __init omap_3430sdp_init_early(void)
 {
 	omap_board_config = sdp3430_config;
 	omap_board_config_size = ARRAY_SIZE(sdp3430_config);
 	omap3_pm_init_cpuidle(omap3_cpuidle_params_table);
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(hyb18m512160af6_sdrc_params, NULL);
-	omap_init_irq();
 }
 
 static int sdp3430_batt_table[] = {

@@ -822,9 +821,10 @@ static void __init omap_3430sdp_init(void)
 MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board")
 	/* Maintainer: Syed Khasim - Texas Instruments Inc */
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= omap_3430sdp_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= omap_3430sdp_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= omap_3430sdp_init,
 	.timer		= &omap_timer,
 MACHINE_END

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

index 6264564..1653875 100644
@@ -69,14 +69,13 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 static struct omap_board_config_kernel sdp_config[] __initdata = {
 };
 
-static void __init omap_sdp_init_irq(void)
+static void __init omap_sdp_init_early(void)
 {
 	omap_board_config = sdp_config;
 	omap_board_config_size = ARRAY_SIZE(sdp_config);
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params,
 				  h8mbx00u0mer0em_sdrc_params);
-	omap_init_irq();
 }
 
 #ifdef CONFIG_OMAP_MUX

@@ -216,9 +215,10 @@ static void __init omap_sdp_init(void)
 
 MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board")
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= omap_sdp_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= omap_sdp_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= omap_sdp_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-4430sdp.c +4 -4

index 07d1b20..12d99e5 100644
@@ -239,7 +239,7 @@ static struct omap_board_config_kernel sdp4430_config[] __initdata = {
 	{ OMAP_TAG_LCD,		&sdp4430_lcd_config },
 };
 
-static void __init omap_4430sdp_init_irq(void)
+static void __init omap_4430sdp_init_early(void)
 {
 	omap_board_config = sdp4430_config;
 	omap_board_config_size = ARRAY_SIZE(sdp4430_config);

@@ -248,7 +248,6 @@ static void __init omap_4430sdp_init_irq(void)
 #ifdef CONFIG_OMAP_32K_TIMER
 	omap2_gp_clockevent_set_gptimer(1);
 #endif
-	gic_init_irq();
 }
 
 static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {

@@ -605,9 +604,10 @@ static void __init omap_4430sdp_map_io(void)
 MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")
 	/* Maintainer: Santosh Shilimkar - Texas Instruments Inc */
 	.boot_params	= 0x80000100,
-	.map_io		= omap_4430sdp_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= omap_4430sdp_init_irq,
+	.map_io		= omap_4430sdp_map_io,
+	.init_early	= omap_4430sdp_init_early,
+	.init_irq	= gic_init_irq,
 	.init_machine	= omap_4430sdp_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-am3517crane.c +4 -4

index 71acb5a..ae3a83d 100644
@@ -49,14 +49,13 @@ static struct omap_board_mux board_mux[] __initdata = {
 #define board_mux	NULL
 #endif
 
-static void __init am3517_crane_init_irq(void)
+static void __init am3517_crane_init_early(void)
 {
 	omap_board_config = am3517_crane_config;
 	omap_board_config_size = ARRAY_SIZE(am3517_crane_config);
 
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(NULL, NULL);
-	omap_init_irq();
 }
 
 static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = {

@@ -108,9 +107,10 @@ static void __init am3517_crane_init(void)
 
 MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD")
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= am3517_crane_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= am3517_crane_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= am3517_crane_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-am3517evm.c +4 -4

index 10d60b7..d0d0f55 100644
@@ -396,13 +396,12 @@ static struct platform_device *am3517_evm_devices[] __initdata = {
 	&am3517_evm_dss_device,
 };
 
-static void __init am3517_evm_init_irq(void)
+static void __init am3517_evm_init_early(void)
 {
 	omap_board_config = am3517_evm_config;
 	omap_board_config_size = ARRAY_SIZE(am3517_evm_config);
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(NULL, NULL);
-	omap_init_irq();
 }
 
 static struct omap_musb_board_data musb_board_data = {

@@ -521,9 +520,10 @@ static void __init am3517_evm_init(void)
 
 MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= am3517_evm_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= am3517_evm_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= am3517_evm_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-apollon.c +4 -4

index 9f55b68..4ef4aad 100644
@@ -274,13 +274,12 @@ static struct omap_board_config_kernel apollon_config[] __initdata = {
 	{ OMAP_TAG_LCD,		&apollon_lcd_config },
 };
 
-static void __init omap_apollon_init_irq(void)
+static void __init omap_apollon_init_early(void)
 {
 	omap_board_config = apollon_config;
 	omap_board_config_size = ARRAY_SIZE(apollon_config);
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(NULL, NULL);
-	omap_init_irq();
 }
 
 static void __init apollon_led_init(void)

@@ -355,9 +354,10 @@ static void __init omap_apollon_map_io(void)
 MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon")
 	/* Maintainer: Kyungmin Park <[email protected]> */
 	.boot_params	= 0x80000100,
-	.map_io		= omap_apollon_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= omap_apollon_init_irq,
+	.map_io		= omap_apollon_map_io,
+	.init_early	= omap_apollon_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= omap_apollon_init,
 	.timer		= &omap_timer,
 MACHINE_END

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

index dac1416..9e4de92 100644
@@ -683,7 +683,7 @@ static void __init cm_t35_init_i2c(void)
 static struct omap_board_config_kernel cm_t35_config[] __initdata = {
 };
 
-static void __init cm_t35_init_irq(void)
+static void __init cm_t35_init_early(void)
 {
 	omap_board_config = cm_t35_config;
 	omap_board_config_size = ARRAY_SIZE(cm_t35_config);

@@ -691,7 +691,6 @@ static void __init cm_t35_init_irq(void)
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(mt46h32m32lf6_sdrc_params,
 			     mt46h32m32lf6_sdrc_params);
-	omap_init_irq();
 }
 
 static struct omap_board_mux board_mux[] __initdata = {

@@ -815,9 +814,10 @@ static void __init cm_t35_init(void)
 
 MACHINE_START(CM_T35, "Compulab CM-T35")
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= cm_t35_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= cm_t35_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= cm_t35_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-cm-t3517.c +4 -4

index 5b0c777..1d92afd 100644
@@ -243,14 +243,13 @@ static inline void cm_t3517_init_nand(void) {}
 static struct omap_board_config_kernel cm_t3517_config[] __initdata = {
 };
 
-static void __init cm_t3517_init_irq(void)
+static void __init cm_t3517_init_early(void)
 {
 	omap_board_config = cm_t3517_config;
 	omap_board_config_size = ARRAY_SIZE(cm_t3517_config);
 
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(NULL, NULL);
-	omap_init_irq();
 }
 
 static struct omap_board_mux board_mux[] __initdata = {

@@ -284,9 +283,10 @@ static void __init cm_t3517_init(void)
 
 MACHINE_START(CM_T3517, "Compulab CM-T3517")
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve        = omap_reserve,
-	.init_irq	= cm_t3517_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= cm_t3517_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= cm_t3517_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-devkit8000.c +7 -2

index 00bb1fc..c6a152b 100644
@@ -452,11 +452,15 @@ static struct platform_device keys_gpio = {
 };
 
 
-static void __init devkit8000_init_irq(void)
+static void __init devkit8000_init_early(void)
 {
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(mt46h32m32lf6_sdrc_params,
 				  mt46h32m32lf6_sdrc_params);
+}
+
+static void __init devkit8000_init_irq(void)
+{
 	omap_init_irq();
 #ifdef CONFIG_OMAP_32K_TIMER
 	omap2_gp_clockevent_set_gptimer(12);

@@ -809,8 +813,9 @@ static void __init devkit8000_init(void)
 
 MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000")
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
+	.map_io		= omap3_map_io,
+	.init_early	= devkit8000_init_early,
 	.init_irq	= devkit8000_init_irq,
 	.init_machine	= devkit8000_init,
 	.timer		= &omap_timer,

arch/arm/mach-omap2/board-generic.c +4 -4

index 0e3d81e..682da92 100644
@@ -33,13 +33,12 @@
 static struct omap_board_config_kernel generic_config[] = {
 };
 
-static void __init omap_generic_init_irq(void)
+static void __init omap_generic_init_early(void)
 {
 	omap_board_config = generic_config;
 	omap_board_config_size = ARRAY_SIZE(generic_config);
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(NULL, NULL);
-	omap_init_irq();
 }
 
 static void __init omap_generic_init(void)

@@ -68,9 +67,10 @@ static void __init omap_generic_map_io(void)
 MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")
 	/* Maintainer: Paul Mundt <[email protected]> */
 	.boot_params	= 0x80000100,
-	.map_io		= omap_generic_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= omap_generic_init_irq,
+	.map_io		= omap_generic_map_io,
+	.init_early	= omap_generic_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= omap_generic_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-h4.c +7 -2

index 25cc9da..f6a3872 100644
@@ -290,12 +290,16 @@ static struct omap_board_config_kernel h4_config[] __initdata = {
 	{ OMAP_TAG_LCD,		&h4_lcd_config },
 };
 
-static void __init omap_h4_init_irq(void)
+static void __init omap_h4_init_early(void)
 {
 	omap_board_config = h4_config;
 	omap_board_config_size = ARRAY_SIZE(h4_config);
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(NULL, NULL);
+}
+
+static void __init omap_h4_init_irq(void)
+{
 	omap_init_irq();
 	h4_init_flash();
 }

@@ -378,8 +382,9 @@ static void __init omap_h4_map_io(void)
 MACHINE_START(OMAP_H4, "OMAP2420 H4 board")
 	/* Maintainer: Paul Mundt <[email protected]> */
 	.boot_params	= 0x80000100,
-	.map_io		= omap_h4_map_io,
 	.reserve	= omap_reserve,
+	.map_io		= omap_h4_map_io,
+	.init_early	= omap_h4_init_early,
 	.init_irq	= omap_h4_init_irq,
 	.init_machine	= omap_h4_init,
 	.timer		= &omap_timer,

arch/arm/mach-omap2/board-igep0020.c +4 -4

index 3be85a1..dd0b1ac 100644
@@ -525,12 +525,11 @@ static struct platform_device *igep2_devices[] __initdata = {
 	&igep2_vwlan_device,
 };
 
-static void __init igep2_init_irq(void)
+static void __init igep2_init_early(void)
 {
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(m65kxxxxam_sdrc_params,
 				  m65kxxxxam_sdrc_params);
-	omap_init_irq();
 }
 
 static struct twl4030_codec_audio_data igep2_audio_data = {

@@ -716,9 +715,10 @@ static void __init igep2_init(void)
 
 MACHINE_START(IGEP0020, "IGEP v2 board")
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= igep2_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= igep2_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= igep2_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-igep0030.c +3 -3

index 4dc62a9..d75028e 100644
@@ -331,12 +331,11 @@ static struct platform_device *igep3_devices[] __initdata = {
 	&igep3_vwlan_device,
 };
 
-static void __init igep3_init_irq(void)
+static void __init igep3_init_early(void)
 {
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(m65kxxxxam_sdrc_params,
 				  m65kxxxxam_sdrc_params);
-	omap_init_irq();
 }
 
 static struct twl4030_platform_data igep3_twl4030_pdata = {

@@ -452,7 +451,8 @@ MACHINE_START(IGEP0030, "IGEP OMAP3 module")
 	.boot_params	= 0x80000100,
 	.reserve	= omap_reserve,
 	.map_io		= omap3_map_io,
-	.init_irq	= igep3_init_irq,
+	.init_early	= igep3_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= igep3_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-ldp.c +4 -4

index e5dc748..d8eb2cb 100644
@@ -288,13 +288,12 @@ static struct omap_board_config_kernel ldp_config[] __initdata = {
 	{ OMAP_TAG_LCD,		&ldp_lcd_config },
 };
 
-static void __init omap_ldp_init_irq(void)
+static void __init omap_ldp_init_early(void)
 {
 	omap_board_config = ldp_config;
 	omap_board_config_size = ARRAY_SIZE(ldp_config);
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(NULL, NULL);
-	omap_init_irq();
 }
 
 static struct twl4030_usb_data ldp_usb_data = {

@@ -443,9 +442,10 @@ static void __init omap_ldp_init(void)
 
 MACHINE_START(OMAP_LDP, "OMAP LDP board")
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= omap_ldp_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= omap_ldp_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= omap_ldp_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-n8x0.c +10 -8

index f396756..b36cbd2 100644
@@ -628,11 +628,10 @@ static void __init n8x0_map_io(void)
 	omap242x_map_common_io();
 }
 
-static void __init n8x0_init_irq(void)
+static void __init n8x0_init_early(void)
 {
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(NULL, NULL);
-	omap_init_irq();
 }
 
 #ifdef CONFIG_OMAP_MUX

@@ -703,27 +702,30 @@ static void __init n8x0_init_machine(void)
 
 MACHINE_START(NOKIA_N800, "Nokia N800")
 	.boot_params	= 0x80000100,
-	.map_io		= n8x0_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= n8x0_init_irq,
+	.map_io		= n8x0_map_io,
+	.init_early	= n8x0_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= n8x0_init_machine,
 	.timer		= &omap_timer,
 MACHINE_END
 
 MACHINE_START(NOKIA_N810, "Nokia N810")
 	.boot_params	= 0x80000100,
-	.map_io		= n8x0_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= n8x0_init_irq,
+	.map_io		= n8x0_map_io,
+	.init_early	= n8x0_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= n8x0_init_machine,
 	.timer		= &omap_timer,
 MACHINE_END
 
 MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")
 	.boot_params	= 0x80000100,
-	.map_io		= n8x0_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= n8x0_init_irq,
+	.map_io		= n8x0_map_io,
+	.init_early	= n8x0_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= n8x0_init_machine,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-omap3beagle.c +7 -2

index 46d814a..19bcd00 100644
@@ -536,11 +536,15 @@ static struct platform_device keys_gpio = {
 	},
 };
 
-static void __init omap3_beagle_init_irq(void)
+static void __init omap3_beagle_init_early(void)
 {
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(mt46h32m32lf6_sdrc_params,
 				  mt46h32m32lf6_sdrc_params);
+}
+
+static void __init omap3_beagle_init_irq(void)
+{
 	omap_init_irq();
 #ifdef CONFIG_OMAP_32K_TIMER
 	omap2_gp_clockevent_set_gptimer(12);

@@ -638,8 +642,9 @@ static void __init omap3_beagle_init(void)
 MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
 	/* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
+	.map_io		= omap3_map_io,
+	.init_early	= omap3_beagle_init_early,
 	.init_irq	= omap3_beagle_init_irq,
 	.init_machine	= omap3_beagle_init,
 	.timer		= &omap_timer,

arch/arm/mach-omap2/board-omap3evm.c +4 -4

index 323c380..c2a0fca 100644
@@ -625,13 +625,12 @@ static struct spi_board_info omap3evm_spi_board_info[] = {
 static struct omap_board_config_kernel omap3_evm_config[] __initdata = {
 };
 
-static void __init omap3_evm_init_irq(void)
+static void __init omap3_evm_init_early(void)
 {
 	omap_board_config = omap3_evm_config;
 	omap_board_config_size = ARRAY_SIZE(omap3_evm_config);
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL);
-	omap_init_irq();
 }
 
 static struct platform_device *omap3_evm_devices[] __initdata = {

@@ -720,9 +719,10 @@ static void __init omap3_evm_init(void)
 MACHINE_START(OMAP3EVM, "OMAP3 EVM")
 	/* Maintainer: Syed Mohammed Khasim - Texas Instruments */
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= omap3_evm_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= omap3_evm_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= omap3_evm_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-omap3logic.c +5 -4

index 15e4b08..b726943 100644
@@ -195,11 +195,10 @@ static inline void __init board_smsc911x_init(void)
 	gpmc_smsc911x_init(&board_smsc911x_data);
 }
 
-static void __init omap3logic_init_irq(void)
+static void __init omap3logic_init_early(void)
 {
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(NULL, NULL);
-	omap_init_irq();
 }
 
 #ifdef CONFIG_OMAP_MUX

@@ -225,7 +224,8 @@ static void __init omap3logic_init(void)
 MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board")
 	.boot_params	= 0x80000100,
 	.map_io		= omap3_map_io,
-	.init_irq	= omap3logic_init_irq,
+	.init_early	= omap3logic_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= omap3logic_init,
 	.timer		= &omap_timer,
 MACHINE_END

@@ -233,7 +233,8 @@ MACHINE_END
 MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board")
 	.boot_params	= 0x80000100,
 	.map_io		= omap3_map_io,
-	.init_irq	= omap3logic_init_irq,
+	.init_early	= omap3logic_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= omap3logic_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-omap3pandora.c +4 -4

index 0b34bed..b91f74c 100644
@@ -634,12 +634,11 @@ static struct spi_board_info omap3pandora_spi_board_info[] __initdata = {
 	}
 };
 
-static void __init omap3pandora_init_irq(void)
+static void __init omap3pandora_init_early(void)
 {
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(mt46h32m32lf6_sdrc_params,
 				  mt46h32m32lf6_sdrc_params);
-	omap_init_irq();
 }
 
 static void __init pandora_wl1251_init(void)

@@ -727,9 +726,10 @@ static void __init omap3pandora_init(void)
 
 MACHINE_START(OMAP3_PANDORA, "Pandora Handheld Console")
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= omap3pandora_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= omap3pandora_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= omap3pandora_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-omap3stalker.c +6 -1

index 2a2dad4..5d1ccef 100644
@@ -591,12 +591,16 @@ static struct spi_board_info omap3stalker_spi_board_info[] = {
 static struct omap_board_config_kernel omap3_stalker_config[] __initdata = {
 };
 
-static void __init omap3_stalker_init_irq(void)
+static void __init omap3_stalker_init_early(void)
 {
 	omap_board_config = omap3_stalker_config;
 	omap_board_config_size = ARRAY_SIZE(omap3_stalker_config);
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL);
+}
+
+static void __init omap3_stalker_init_irq(void)
+{
 	omap_init_irq();
 #ifdef CONFIG_OMAP_32K_TIMER
 	omap2_gp_clockevent_set_gptimer(12);

@@ -666,6 +670,7 @@ MACHINE_START(SBC3530, "OMAP3 STALKER")
 	/* Maintainer: Jason Lam -lzg at ema-tech.com */
 	.boot_params		= 0x80000100,
 	.map_io			= omap3_map_io,
+	.init_early		= omap3_stalker_init_early,
 	.init_irq		= omap3_stalker_init_irq,
 	.init_machine		= omap3_stalker_init,
 	.timer			= &omap_timer,

arch/arm/mach-omap2/board-omap3touchbook.c +7 -2

index db1f74f..6a60f79 100644
@@ -415,7 +415,7 @@ static struct omap_board_mux board_mux[] __initdata = {
 };
 #endif
 
-static void __init omap3_touchbook_init_irq(void)
+static void __init omap3_touchbook_init_early(void)
 {
 	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
 	omap_board_config = omap3_touchbook_config;

@@ -423,6 +423,10 @@ static void __init omap3_touchbook_init_irq(void)
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(mt46h32m32lf6_sdrc_params,
 				  mt46h32m32lf6_sdrc_params);
+}
+
+static void __init omap3_touchbook_init_irq(void)
+{
 	omap_init_irq();
 #ifdef CONFIG_OMAP_32K_TIMER
 	omap2_gp_clockevent_set_gptimer(12);

@@ -538,8 +542,9 @@ static void __init omap3_touchbook_init(void)
 MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board")
 	/* Maintainer: Gregoire Gentil - http://www.alwaysinnovating.com */
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
+	.map_io		= omap3_map_io,
+	.init_early	= omap3_touchbook_init_early,
 	.init_irq	= omap3_touchbook_init_irq,
 	.init_machine	= omap3_touchbook_init,
 	.timer		= &omap_timer,

arch/arm/mach-omap2/board-omap4panda.c +3 -3

index e001a04..5487d0e 100644
@@ -76,11 +76,10 @@ static struct platform_device *panda_devices[] __initdata = {
 	&leds_gpio,
 };
 
-static void __init omap4_panda_init_irq(void)
+static void __init omap4_panda_init_early(void)
 {
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(NULL, NULL);
-	gic_init_irq();
 }
 
 static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {

@@ -426,7 +425,8 @@ MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board")
 	.boot_params	= 0x80000100,
 	.reserve	= omap_reserve,
 	.map_io		= omap4_panda_map_io,
-	.init_irq	= omap4_panda_init_irq,
+	.init_early	= omap4_panda_init_early,
+	.init_irq	= gic_init_irq,
 	.init_machine	= omap4_panda_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-overo.c +4 -4

index cb26e5d..a33ec0e 100644
@@ -409,14 +409,13 @@ static struct omap_board_config_kernel overo_config[] __initdata = {
 	{ OMAP_TAG_LCD,		&overo_lcd_config },
 };
 
-static void __init overo_init_irq(void)
+static void __init overo_init_early(void)
 {
 	omap_board_config = overo_config;
 	omap_board_config_size = ARRAY_SIZE(overo_config);
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(mt46h32m32lf6_sdrc_params,
 				  mt46h32m32lf6_sdrc_params);
-	omap_init_irq();
 }
 
 static struct platform_device *overo_devices[] __initdata = {

@@ -501,9 +500,10 @@ static void __init overo_init(void)
 
 MACHINE_START(OVERO, "Gumstix Overo")
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= overo_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= overo_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= overo_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-rm680.c +4 -4

index cb77be7..b750a40 100644
@@ -141,14 +141,13 @@ static void __init rm680_peripherals_init(void)
 	omap2_hsmmc_init(mmc);
 }
 
-static void __init rm680_init_irq(void)
+static void __init rm680_init_early(void)
 {
 	struct omap_sdrc_params *sdrc_params;
 
 	omap2_init_common_infrastructure();
 	sdrc_params = nokia_get_sdram_timings();
 	omap2_init_common_devices(sdrc_params, sdrc_params);
-	omap_init_irq();
 }
 
 #ifdef CONFIG_OMAP_MUX

@@ -179,9 +178,10 @@ static void __init rm680_map_io(void)
 
 MACHINE_START(NOKIA_RM680, "Nokia RM-680 board")
 	.boot_params	= 0x80000100,
-	.map_io		= rm680_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= rm680_init_irq,
+	.map_io		= rm680_map_io,
+	.init_early	= rm680_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= rm680_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-rx51.c +4 -4

index f53fc55..3cf72fe 100644
@@ -98,7 +98,7 @@ static struct omap_board_config_kernel rx51_config[] = {
 	{ OMAP_TAG_LCD,		&rx51_lcd_config },
 };
 
-static void __init rx51_init_irq(void)
+static void __init rx51_init_early(void)
 {
 	struct omap_sdrc_params *sdrc_params;

@@ -108,7 +108,6 @@ static void __init rx51_init_irq(void)
 	omap2_init_common_infrastructure();
 	sdrc_params = nokia_get_sdram_timings();
 	omap2_init_common_devices(sdrc_params, sdrc_params);
-	omap_init_irq();
 }
 
 extern void __init rx51_peripherals_init(void);

@@ -149,9 +148,10 @@ static void __init rx51_map_io(void)
 MACHINE_START(NOKIA_RX51, "Nokia RX-51 board")
 	/* Maintainer: Lauri Leukkunen <[email protected]> */
 	.boot_params	= 0x80000100,
-	.map_io		= rx51_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= rx51_init_irq,
+	.map_io		= rx51_map_io,
+	.init_early	= rx51_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= rx51_init,
 	.timer		= &omap_timer,
 MACHINE_END

arch/arm/mach-omap2/board-zoom.c +7 -7

index e26754c..85d4170 100644
@@ -33,7 +33,7 @@
 
 #define ZOOM3_EHCI_RESET_GPIO		64
 
-static void __init omap_zoom_init_irq(void)
+static void __init omap_zoom_init_early(void)
 {
 	omap2_init_common_infrastructure();
 	if (machine_is_omap_zoom2())

@@ -42,8 +42,6 @@ static void __init omap_zoom_init_irq(void)
 	else if (machine_is_omap_zoom3())
 		omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params,
 					  h8mbx00u0mer0em_sdrc_params);
-
-	omap_init_irq();
 }
 
 #ifdef CONFIG_OMAP_MUX

@@ -135,18 +133,20 @@ static void __init omap_zoom_init(void)
 
 MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= omap_zoom_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= omap_zoom_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= omap_zoom_init,
 	.timer		= &omap_timer,
 MACHINE_END
 
 MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
 	.boot_params	= 0x80000100,
-	.map_io		= omap3_map_io,
 	.reserve	= omap_reserve,
-	.init_irq	= omap_zoom_init_irq,
+	.map_io		= omap3_map_io,
+	.init_early	= omap_zoom_init_early,
+	.init_irq	= omap_init_irq,
 	.init_machine	= omap_zoom_init,
 	.timer		= &omap_timer,
 MACHINE_END

Signature · 1 line

1.6.2.5

Russell King - ARM Linux

author

2011-01-23 17:48 UTC #1 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

Quoted 7 lines · Russell King - ARM Linux

Move non-mapping and non-irq initialization code out of .map_io and .init_irq respectively into the new init_early hook.
Signed-off-by Russell King <[email protected]>
---
I think I've updated this patch correctly for the new platforms merged into mainline.

Grr, this breaks on OMAP because some of this stuff wants to do ioremap() and therefore wants the kmem allocators initialized. That's rather annoying...

Tony Lindgren

maintainer

2011-01-24 20:17 UTC #2 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

Quoted 4 lines · Russell King - ARM Linux

Quoted 3 lines · Russell King - ARM Linux
Move non-mapping and non-irq initialization code out of .map_io and .init_irq respectively into the new init_early hook.

Quoted 8 lines

Quoted 4 lines
Signed-off-by Russell King <[email protected]>
---
I think I've updated this patch correctly for the new platforms merged into mainline.
Grr, this breaks on OMAP because some of this stuff wants to do ioremap() and therefore wants the kmem allocators initialized. That's rather annoying...

So far tested on zoom3 only, but the following gets it booting on top of your patch.

Want to take this one into your series?

Meanwhile, I'll add these both into our omap-testing branch for some more testing.

Regards,

Tony

From: Tony Lindgren <[email protected]>
Date: Mon, 24 Jan 2011 11:56:37 -0800
Subject: [PATCH] omap2+: Fix omap_serial_early_init to work with init_early hook

The new init_early hook happens at the end of setup_arch, which is too early for kzalloc. However, there's no need to call omap_serial_early_init that early, so fix this by setting it up as a subsys_initcall.

Signed-off-by Tony Lindgren <[email protected]>

arch/arm/mach-omap2/io.c +0 -2

@@ -400,8 +400,6 @@ void __init omap2_init_common_infrastructure(void)
 void __init omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0,
 				      struct omap_sdrc_params *sdrc_cs1)
 {
-	omap_serial_early_init();
-
 	omap_hwmod_late_init();
 
 	if (cpu_is_omap24xx() || cpu_is_omap34xx()) {

arch/arm/mach-omap2/serial.c +4 -1

@@ -655,7 +655,7 @@ static void serial_out_override(struct uart_port *up, int offset, int value)
 }
 #endif
 
-void __init omap_serial_early_init(void)
+static int __init omap_serial_early_init(void)
 {
 	int i = 0;

@@ -691,7 +691,10 @@ void __init omap_serial_early_init(void)
 		 */
 		uart->oh->flags |= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET;
 	} while (1);
+
+	return 0;
 }
+subsys_initcall(omap_serial_early_init);
 
 /**
  * omap_serial_init_port() - initialize single serial port

arch/arm/plat-omap/include/plat/serial.h +0 -1

@@ -96,7 +96,6 @@
 
 struct omap_board_data;
 
-extern void __init omap_serial_early_init(void);
 extern void omap_serial_init(void);
 extern void omap_serial_init_port(struct omap_board_data *bdata);
 extern int omap_uart_can_sleep(void);

Tony Lindgren

maintainer

2011-01-24 20:26 UTC #3 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

Quoted 3 lines · Tony Lindgren

So far tested on zoom3 only, but the following gets it booting on top of your patch.

Looks like there are some other patches needed too.. At least omap4 still fails with these.

Tony

Russell King - ARM Linux

author

2011-01-24 21:52 UTC #4 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

Quoted 7 lines · Tony Lindgren

Quoted 3 lines · Tony Lindgren
So far tested on zoom3 only, but the following gets it booting on top of your patch.
Looks like there are some other patches needed too.. At least omap4 still fails with these.

Tony Lindgren

maintainer

2011-01-25 02:21 UTC #5 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

Quoted 6 lines · Russell King - ARM Linux

Quoted 5 lines · Tony Lindgren
Quoted 3 lines · Tony Lindgren
So far tested on zoom3 only, but the following gets it booting on top of your patch.

Quoted 6 lines

Quoted 2 lines
Looks like there are some other patches needed too.. At least omap4 still fails with these.
From what I remember, the problem I saw on OMAP4 was hwmod related as it seemed to be using ioremap() - which with its initialization moved before memory allocators were up and running causes an oops.

To me it seems _find_mpu_rt_base should be moved to omap_hwmod_late_init as we don't want to have a static mapping for everything. AFAIK the oh->_mpu_rt_va should not be needed early.

Any comments on that Paul? See also the two patches I'll post as a reply to this thread make omap_hwmod_late_init a core_initcall.

The issue for omap4 still needs to be sorted out. And then we can see which omap initcalls really need to be core_initcalls.

Regards,

Tony

Tony Lindgren

maintainer

2011-01-25 02:24 UTC #6 lore raw

PATCH 1/1 omap2+: Make omap_hwmod_late_init into core_initcall

Otherwise things will fail with early_init changes.

Signed-off-by Tony Lindgren <[email protected]>

arch/arm/mach-omap2/io.c +0 -2

index e66687b..8f47609 100644
@@ -402,8 +402,6 @@ void __init omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0,
 {
 	omap_serial_early_init();
 
-	omap_hwmod_late_init();
-
 	if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
 		omap2_sdrc_init(sdrc_cs0, sdrc_cs1);
 		_omap2_init_reprogram_sdrc();

arch/arm/mach-omap2/omap_hwmod.c +2 -1

index e282e35..eacdfd3 100644
@@ -1628,7 +1628,7 @@ int __init omap_hwmod_init(struct omap_hwmod **ohs)
  * to struct clk pointers for each registered omap_hwmod.  Also calls
  * _setup() on each hwmod.  Returns 0.
  */
-int omap_hwmod_late_init(void)
+static int __init omap_hwmod_late_init(void)
 {
 	int r;

@@ -1644,6 +1644,7 @@ int omap_hwmod_late_init(void)
 
 	return 0;
 }
+core_initcall(omap_hwmod_late_init);
 
 /**
  * omap_hwmod_enable - enable an omap_hwmod

arch/arm/plat-omap/include/plat/omap_hwmod.h +0 -1

index 1eee85a..fedd829 100644
@@ -539,7 +539,6 @@ int omap_hwmod_init(struct omap_hwmod **ohs);
 struct omap_hwmod *omap_hwmod_lookup(const char *name);
 int omap_hwmod_for_each(int (*fn)(struct omap_hwmod *oh, void *data),
 			void *data);
-int omap_hwmod_late_init(void);
 
 int omap_hwmod_enable(struct omap_hwmod *oh);
 int _omap_hwmod_enable(struct omap_hwmod *oh);

Tony Lindgren

maintainer

2011-01-25 02:25 UTC #7 lore raw

PATCH 1/1 omap2+: Fix omap_serial_early_init to work with init_early hook

In reply to Tony Lindgren

Signed-off-by Tony Lindgren <[email protected]>

arch/arm/mach-omap2/io.c +0 -2

index 8f47609..5678c33 100644
@@ -400,8 +400,6 @@ void __init omap2_init_common_infrastructure(void)
 void __init omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0,
 				      struct omap_sdrc_params *sdrc_cs1)
 {
-	omap_serial_early_init();
-
 	if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
 		omap2_sdrc_init(sdrc_cs0, sdrc_cs1);
 		_omap2_init_reprogram_sdrc();

arch/arm/mach-omap2/serial.c +5 -2

index 302da74..539ec9c 100644
@@ -655,7 +655,7 @@ static void serial_out_override(struct uart_port *up, int offset, int value)
 }
 #endif
 
-void __init omap_serial_early_init(void)
+static int __init omap_serial_early_init(void)
 {
 	int i = 0;

@@ -672,7 +672,7 @@ void __init omap_serial_early_init(void)
 
 		uart = kzalloc(sizeof(struct omap_uart_state), GFP_KERNEL);
 		if (WARN_ON(!uart))
-			return;
+			return -ENODEV;
 
 		uart->oh = oh;
 		uart->num = i++;

@@ -691,7 +691,10 @@ void __init omap_serial_early_init(void)
 		 */
 		uart->oh->flags |= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET;
 	} while (1);
+
+	return 0;
 }
+core_initcall(omap_serial_early_init);
 
 /**
  * omap_serial_init_port() - initialize single serial port

arch/arm/plat-omap/include/plat/serial.h +0 -1

index cec5d56..a1a118d 100644
@@ -96,7 +96,6 @@
 
 struct omap_board_data;
 
-extern void __init omap_serial_early_init(void);
 extern void omap_serial_init(void);
 extern void omap_serial_init_port(struct omap_board_data *bdata);
 extern int omap_uart_can_sleep(void);

Kevin Hilman

2011-01-27 18:01 UTC #8 lore raw

PATCH 1/1 omap2+: Fix omap_serial_early_init to work with init_early hook

Hi Tony,

Quoted 7 lines · Tony Lindgren

The new init_early hook happens at the end of setup_arch, which is too early for kzalloc. However, there's no need to call omap_serial_early_init that early, so fix this by setting it up as a core_initcall.
Signed-off-by Tony Lindgren <[email protected]>

Tested-by Kevin Hilman <[email protected]>

I boot tested these on 3430/n900, 3630/Zoom3 and 4430ES1.0/PAB.

Kevin

Quoted 62 lines

arch/arm/mach-omap2/io.c +0 -2

index 8f47609..5678c33 100644
@@ -400,8 +400,6 @@ void __init omap2_init_common_infrastructure(void)
 void __init omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0,
 				      struct omap_sdrc_params *sdrc_cs1)
 {
-	omap_serial_early_init();
-
 	if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
 		omap2_sdrc_init(sdrc_cs0, sdrc_cs1);
 		_omap2_init_reprogram_sdrc();

arch/arm/mach-omap2/serial.c +5 -2

index 302da74..539ec9c 100644
@@ -655,7 +655,7 @@ static void serial_out_override(struct uart_port *up, int offset, int value)
 }
 #endif
 
-void __init omap_serial_early_init(void)
+static int __init omap_serial_early_init(void)
 {
 	int i = 0;

@@ -672,7 +672,7 @@ void __init omap_serial_early_init(void)
 
 		uart = kzalloc(sizeof(struct omap_uart_state), GFP_KERNEL);
 		if (WARN_ON(!uart))
-			return;
+			return -ENODEV;
 
 		uart->oh = oh;
 		uart->num = i++;

@@ -691,7 +691,10 @@ void __init omap_serial_early_init(void)
 		 */
 		uart->oh->flags |= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET;
 	} while (1);
+
+	return 0;
 }
+core_initcall(omap_serial_early_init);
 
 /**
  * omap_serial_init_port() - initialize single serial port

arch/arm/plat-omap/include/plat/serial.h +0 -2

index cec5d56..a1a118d 100644
@@ -96,7 +96,6 @@
 
 struct omap_board_data;
 
-extern void __init omap_serial_early_init(void);
 extern void omap_serial_init(void);
 extern void omap_serial_init_port(struct omap_board_data *bdata);
 extern int omap_uart_can_sleep(void);
--

To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Tony Lindgren

maintainer

2011-01-25 19:27 UTC #9 lore raw

PATCH 1/1 omap: hwmod: Populate _mpu_rt_va later on in omap_hwmod_late_init

In reply to Tony Lindgren

Otherwise ioremap can fail with early_init patch unless we have a static mapping for everything.

Signed-off-by Tony Lindgren <[email protected]>

arch/arm/mach-omap2/omap_hwmod.c +24 -4

index eacdfd3..9e89a58 100644
@@ -1467,12 +1467,10 @@ static int __init _register(struct omap_hwmod *oh)
 		return -EEXIST;
 
 	ms_id = _find_mpu_port_index(oh);
-	if (!IS_ERR_VALUE(ms_id)) {
+	if (!IS_ERR_VALUE(ms_id))
 		oh->_mpu_port_index = ms_id;
-		oh->_mpu_rt_va = _find_mpu_rt_base(oh, oh->_mpu_port_index);
-	} else {
+	else
 		oh->_int_flags |= _HWMOD_NO_MPU_PORT;
-	}
 
 	list_add_tail(&oh->node, &omap_hwmod_list);

@@ -1621,6 +1619,26 @@ int __init omap_hwmod_init(struct omap_hwmod **ohs)
 	return 0;
 }
 
+/*
+ * _populate_mpu_rt_base - populate the virtual address for a hwmod
+ *
+ * Must be called only from omap_hwmod_late_init so ioremap works properly.
+ * Assumes the caller takes care of locking if needed.
+ *
+ */
+static int __init _populate_mpu_rt_base(struct omap_hwmod *oh, void *data)
+{
+	if (oh->_int_flags & _HWMOD_NO_MPU_PORT)
+		return 0;
+
+	oh->_mpu_rt_va = _find_mpu_rt_base(oh, oh->_mpu_port_index);
+	if (!oh->_mpu_rt_va)
+		pr_warning("omap_hwmod: %s found no _mpu_rt_va for %s\n",
+				__func__, oh->name);
+
+	return 0;
+}
+
 /**
  * omap_hwmod_late_init - do some post-clock framework initialization
  *

@@ -1632,6 +1650,8 @@ static int __init omap_hwmod_late_init(void)
 {
 	int r;
 
+	r = omap_hwmod_for_each(_populate_mpu_rt_base, NULL);
+
 	/* XXX check return value */
 	r = omap_hwmod_for_each(_init_clocks, NULL);
 	WARN(r, "omap_hwmod: omap_hwmod_late_init(): _init_clocks failed\n");

Tony Lindgren

maintainer

2011-01-25 19:29 UTC #10 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

In reply to Tony Lindgren

Quoted 14 lines · Tony Lindgren

Quoted 6 lines · Russell King - ARM Linux
Quoted 5 lines · Tony Lindgren
Quoted 3 lines · Tony Lindgren
So far tested on zoom3 only, but the following gets it booting on top of your patch.
Quoted 6 lines
Quoted 2 lines
Looks like there are some other patches needed too.. At least omap4 still fails with these.
From what I remember, the problem I saw on OMAP4 was hwmod related as it seemed to be using ioremap() - which with its initialization moved before memory allocators were up and running causes an oops.

Quoted 6 lines

To me it seems _find_mpu_rt_base should be moved to omap_hwmod_late_init as we don't want to have a static mapping for everything. AFAIK the oh->_mpu_rt_va should not be needed early.
Any comments on that Paul? See also the two patches I'll post as a reply to this thread make omap_hwmod_late_init a core_initcall.

Posted this patch also, now also omap4 boots.

Tony

Poddar, Sourav

2011-01-25 15:46 UTC #11 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

In reply to Tony Lindgren

Quoted 74 lines · Tony Lindgren

Quoted 4 lines · Russell King - ARM Linux
Quoted 3 lines · Russell King - ARM Linux
Move non-mapping and non-irq initialization code out of .map_io and .init_irq respectively into the new init_early hook.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Russell King <[email protected]>
---
I think I've updated this patch correctly for the new platforms merged into mainline.
Grr, this breaks on OMAP because some of this stuff wants to do ioremap() and therefore wants the kmem allocators initialized. ?That's rather annoying...
So far tested on zoom3 only, but the following gets it booting on top of your patch.
Want to take this one into your series?
Meanwhile, I'll add these both into our omap-testing branch for some more testing.
Regards,
Tony
From: Tony Lindgren <[email protected]>
Date: Mon, 24 Jan 2011 11:56:37 -0800
Subject: [PATCH] omap2+: Fix omap_serial_early_init to work with init_early hook
The new init_early hook happens at the end of setup_arch, which is too early for kzalloc. However, there's no need to call omap_serial_early_init that early, so fix this by setting it up as a subsys_initcall.
Signed-off-by Tony Lindgren <[email protected]>
arch/arm/mach-omap2/io.c +0 -2
@@ -400,8 +400,6 @@ void __init omap2_init_common_infrastructure(void)
 ?void __init omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0,
 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?struct omap_sdrc_params *sdrc_cs1)
 ?{
- ? ? ? omap_serial_early_init();
-
 ? ? ? ?omap_hwmod_late_init();
 
 ? ? ? ?if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
arch/arm/mach-omap2/serial.c +0 -0
@@ -655,7 +655,7 @@ static void serial_out_override(struct uart_port *up, int offset, int value)
 ?}
?#endif
arch/arm/mach-omap2/serial.c +1 -1
-void __init omap_serial_early_init(void)
+static int __init omap_serial_early_init(void)
?{
? ? ? ?int i = 0;
arch/arm/mach-omap2/serial.c +0 -0
@@ -691,7 +691,10 @@ void __init omap_serial_early_init(void)
? ? ? ? ? ? ? ? */
? ? ? ? ? ? ? ?uart->oh->flags |= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET; ? ? ? ?} while (1);
+
+ ? ? ? return 0;
?}
+subsys_initcall(omap_serial_early_init);
?/**
?* omap_serial_init_port() - initialize single serial port

arch/arm/plat-omap/include/plat/serial.h

Quoted 8 lines

arch/arm/plat-omap/include/plat/serial.h +0 -2

@@ -96,7 +96,6 @@
 
 ?struct omap_board_data;
 
-extern void __init omap_serial_early_init(void);
 ?extern void omap_serial_init(void);
 ?extern void omap_serial_init_port(struct omap_board_data *bdata);
 ?extern int omap_uart_can_sleep(void);
--

Just FYI, I observed similar results on OMAP4 for these patches. For OMAP2420, OMAP2430 and OMAP3430 SDPs, you can add my boot

Tested-by Sourav Poddar<[email protected]>

Tony Lindgren

maintainer

2011-01-25 19:28 UTC #12 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

Quoted 4 lines · Poddar, Sourav

Just FYI, I observed similar results on OMAP4 for these patches. For OMAP2420, OMAP2430 and OMAP3430 SDPs, you can add my boot
Tested-by Sourav Poddar<[email protected]>

Thanks, just posted third patch to this thread that fixes things for omap4, care to give that a try too?

Regards,

Tony

Poddar, Sourav

2011-01-26 10:16 UTC #13 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

Quoted 9 lines · Tony Lindgren

Quoted 4 lines · Poddar, Sourav
Just FYI, I observed similar results on OMAP4 for these patches. For OMAP2420, OMAP2430 and OMAP3430 SDPs, you can add my boot
Tested-by Sourav Poddar<[email protected]>
Thanks, just posted third patch to this thread that fixes things for omap4, care to give that a try too?

I applied the third patch and now its booting
fine for OMAP4 also. :)

Tested-by Sourav Poddar<[email protected]>

Tony Lindgren

maintainer

2011-02-14 23:45 UTC #14 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

In reply to Tony Lindgren

Quoted 10 lines · Tony Lindgren

Quoted 9 lines · Russell King - ARM Linux
Quoted 7 lines · Russell King - ARM Linux
Move non-mapping and non-irq initialization code out of .map_io and .init_irq respectively into the new init_early hook.
Signed-off-by Russell King <[email protected]>
---
I think I've updated this patch correctly for the new platforms merged into mainline.

Quoted 8 lines

Quoted 3 lines
Grr, this breaks on OMAP because some of this stuff wants to do ioremap() and therefore wants the kmem allocators initialized. That's rather annoying...
So far tested on zoom3 only, but the following gets it booting on top of your patch.
Want to take this one into your series?

Russell, I'll queue your patch for the upcoming merge window into devel-early-init branch along with my changes.

Will also post one more clean-up patch.

Regards,

Tony

Tony Lindgren

maintainer

2011-02-14 23:52 UTC #15 lore raw

PATCH 1/1 omap: Move omap2_check_revision and omap_sram_init out of map_io

With the early init changes we just want to map IO in map_io. Both omap2_check_revision and omap_sram_init can be moved to happen later in omap2_init_common_infrastructure.

Note that now we can now remove _omap2_map_common_io and remove the extra flushes too as devicemaps_init will take care of it.

Signed-off-by Tony Lindgren <[email protected]>

---

This is on top of the other early init related patches:

omap: hwmod: Populate _mpu_rt_va later on in omap_hwmod_late_init omap2+: Fix omap_serial_early_init to work with init_early hook omap2+: Make omap_hwmod_late_init into core_initcall
ARM: OMAP2: use early init hook

arch/arm/mach-omap2/io.c +3 ~~-17~~

@@ -228,25 +228,11 @@ static struct map_desc omap44xx_io_desc[] __initdata = {
 };
 #endif
 
-static void __init _omap2_map_common_io(void)
-{
-	/* Normally devicemaps_init() would flush caches and tlb after
-	 * mdesc->map_io(), but we must also do it here because of the CPU
-	 * revision check below.
-	 */
-	local_flush_tlb_all();
-	flush_cache_all();
-
-	omap2_check_revision();
-	omap_sram_init();
-}
-
 #ifdef CONFIG_ARCH_OMAP2420
 void __init omap242x_map_common_io(void)
 {
 	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
 	iotable_init(omap242x_io_desc, ARRAY_SIZE(omap242x_io_desc));
-	_omap2_map_common_io();
 }
 #endif

@@ -255,7 +241,6 @@ void __init omap243x_map_common_io(void)
 {
 	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
 	iotable_init(omap243x_io_desc, ARRAY_SIZE(omap243x_io_desc));
-	_omap2_map_common_io();
 }
 #endif

@@ -263,7 +248,6 @@ void __init omap243x_map_common_io(void)
 void __init omap34xx_map_common_io(void)
 {
 	iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));
-	_omap2_map_common_io();
 }
 #endif

@@ -271,7 +255,6 @@ void __init omap34xx_map_common_io(void)
 void __init omap44xx_map_common_io(void)
 {
 	iotable_init(omap44xx_io_desc, ARRAY_SIZE(omap44xx_io_desc));
-	_omap2_map_common_io();
 }
 #endif

@@ -335,6 +318,9 @@ void __init omap2_init_common_infrastructure(void)
 {
 	u8 postsetup_state;
 
+	omap2_check_revision();
+	omap_sram_init();
+
 	if (cpu_is_omap242x()) {
 		omap2xxx_powerdomains_init();
 		omap2_clockdomains_init();

Tony Lindgren

maintainer

2011-02-15 01:53 UTC #16 lore raw

PATCH 1/1 omap: Move omap2_check_revision and omap_sram_init out of map_io

Quoted 6 lines · Tony Lindgren

With the early init changes we just want to map IO in map_io. Both omap2_check_revision and omap_sram_init can be moved to happen later in omap2_init_common_infrastructure.
Note that now we can now remove _omap2_map_common_io and remove the extra flushes too as devicemaps_init will take care of it.

Hmm this one seems to need a bit more work, won't work on 2420.

Tony

Tony Lindgren

maintainer

2011-02-16 17:20 UTC #17 lore raw

PATCH 1/1 omap: Move omap2_check_revision and omap_sram_init out of map_io

Quoted 9 lines · Tony Lindgren

Quoted 6 lines · Tony Lindgren
With the early init changes we just want to map IO in map_io. Both omap2_check_revision and omap_sram_init can be moved to happen later in omap2_init_common_infrastructure.
Note that now we can now remove _omap2_map_common_io and remove the extra flushes too as devicemaps_init will take care of it.
Hmm this one seems to need a bit more work, won't work on 2420.

That's because calling iotable_init after bootmem_init will skip calling arm_bootmem_init and the new memblock_region we never call reserve_bootmem on the new entry. So let's skip this for now.

If we want to do SoC detection and SRAM init later during the boot, we'd have to allocate SRAM the same way as dma-mapping and ioremap code does.

Regards,

Tony

Tony Lindgren

maintainer

2011-01-24 20:19 UTC #18 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

In reply to Russell King - ARM Linux

Quoted 2 lines · Russell King - ARM Linux

Move non-mapping and non-irq initialization code out of .map_io and .init_irq respectively into the new init_early hook.

Nice :)

Quoted 17 lines

Signed-off-by Russell King <[email protected]>
---
I think I've updated this patch correctly for the new platforms merged into mainline.
Please ensure that new platforms merged after this patch also use the new structure, and note that the initializers should be listed in the following order:
	.fixup
	.reserve
	.map_io
	.init_early
	.init_irq
	.timer
	.init_machine

Quoted 2 lines

This is the order in which they are called, so it helps to make sense when reading the board level code if they're arranged in called order.

OK, will do.

Will also add this also into omap-testing. Any other issues that might remain should be easy to fix.

Acked-by Tony Lindgren <[email protected]>

Uwe Kleine-König

2011-01-26 08:46 UTC #19 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

In reply to Russell King - ARM Linux

Hello Russell,

Quoted 12 lines · Russell King - ARM Linux

Move non-mapping and non-irq initialization code out of .map_io and .init_irq respectively into the new init_early hook.
Signed-off-by Russell King <[email protected]>
---
I think I've updated this patch correctly for the new platforms merged into mainline.
Please ensure that new platforms merged after this patch also use the new structure, and note that the initializers should be listed in the following order:

Quoted 7 lines

	.fixup
	.reserve
	.map_io
	.init_early
	.init_irq
	.timer
	.init_machine

Will you care for imx (mach-{mx*,imx}), too, or should I fix them up?

Best regards
Uwe

Signature · 2 lines

Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Russell King - ARM Linux

author

2011-01-26 08:52 UTC #20 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

Quoted 1 line · Uwe Kleine-K?nig

Will you care for imx (mach-{mx*,imx}), too, or should I fix them up?

Does mx stuff do non-irq setup or non-map_io stuff in those callbacks?

Uwe Kleine-König

2011-01-26 09:11 UTC #21 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

Quoted 4 lines · Russell King - ARM Linux

Quoted 1 line · Uwe Kleine-K?nig
Will you care for imx (mach-{mx*,imx}), too, or should I fix them up?
Does mx stuff do non-irq setup or non-map_io stuff in those callbacks?

the map_io callbacks (e.g. mx27_map_io) setup the infrastructure for cpu_is_xyz and arch_reset.

Best regards
Uwe

Signature · 2 lines

Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Russell King - ARM Linux

author

2011-01-26 10:31 UTC #22 lore raw

PATCH 1/1 ARM: OMAP2: use early init hook

Quoted 7 lines · Uwe Kleine-K?nig

Quoted 4 lines · Russell King - ARM Linux
Quoted 1 line · Uwe Kleine-K?nig
Will you care for imx (mach-{mx*,imx}), too, or should I fix them up?
Does mx stuff do non-irq setup or non-map_io stuff in those callbacks?
the map_io callbacks (e.g. mx27_map_io) setup the infrastructure for cpu_is_xyz and arch_reset.

In which case yes please.

Uwe Kleine-König

2011-02-07 15:35 UTC #23 lore raw

PATCH 1/4 ARM: imx: use .init_early to initialize cpu type and reset address

This used to be done in .map_io which is supposed to only setup the memory mapping.

Signed-off-by Uwe Kleine-K?nig <[email protected]>

---
 arch/arm/mach-imx/mach-cpuimx27.c           |   11 ++++++-----
 arch/arm/mach-imx/mach-eukrea_cpuimx25.c    |   11 ++++++-----
 arch/arm/mach-imx/mach-imx27_visstrim_m10.c |   11 ++++++-----
 arch/arm/mach-imx/mach-imx27ipcam.c         |   11 ++++++-----
 arch/arm/mach-imx/mach-imx27lite.c          |   11 ++++++-----
 arch/arm/mach-imx/mach-mx1ads.c             |   22 ++++++++++++----------
 arch/arm/mach-imx/mach-mx21ads.c            |   11 ++++++-----
 arch/arm/mach-imx/mach-mx25_3ds.c           |   12 ++++++------
 arch/arm/mach-imx/mach-mx27_3ds.c           |   11 ++++++-----
 arch/arm/mach-imx/mach-mx27ads.c            |   11 ++++++-----
 arch/arm/mach-imx/mach-mxt_td60.c           |   12 ++++++------
 arch/arm/mach-imx/mach-pca100.c             |   12 ++++++------
 arch/arm/mach-imx/mach-pcm038.c             |   11 ++++++-----
 arch/arm/mach-imx/mach-scb9328.c            |   13 +++++++------
 arch/arm/mach-imx/mm-imx1.c                 |    7 +++++--
 arch/arm/mach-imx/mm-imx21.c                |    7 +++++--
 arch/arm/mach-imx/mm-imx25.c                |    7 +++++--
 arch/arm/mach-imx/mm-imx27.c                |    7 +++++--
 arch/arm/plat-mxc/include/mach/common.h     |    4 ++++
 19 files changed, 115 insertions(+), 87 deletions(-)

arch/arm/mach-imx/mach-cpuimx27.c +6 -5

index 6cf04da..cabb800 100644
@@ -304,9 +304,10 @@ static struct sys_timer eukrea_cpuimx27_timer = {
 };
 
 MACHINE_START(CPUIMX27, "EUKREA CPUIMX27")
-	.boot_params    = MX27_PHYS_OFFSET + 0x100,
-	.map_io         = mx27_map_io,
-	.init_irq       = mx27_init_irq,
-	.init_machine   = eukrea_cpuimx27_init,
-	.timer          = &eukrea_cpuimx27_timer,
+	.boot_params = MX27_PHYS_OFFSET + 0x100,
+	.map_io = mx27_map_io,
+	.init_early = imx27_init_early,
+	.init_irq = mx27_init_irq,
+	.timer = &eukrea_cpuimx27_timer,
+	.init_machine = eukrea_cpuimx27_init,
 MACHINE_END

arch/arm/mach-imx/mach-eukrea_cpuimx25.c +6 -5

index eb395ab..439167d 100644
@@ -153,9 +153,10 @@ static struct sys_timer eukrea_cpuimx25_timer = {
 
 MACHINE_START(EUKREA_CPUIMX25, "Eukrea CPUIMX25")
 	/* Maintainer: Eukrea Electromatique */
-	.boot_params    = MX25_PHYS_OFFSET + 0x100,
-	.map_io         = mx25_map_io,
-	.init_irq       = mx25_init_irq,
-	.init_machine   = eukrea_cpuimx25_init,
-	.timer          = &eukrea_cpuimx25_timer,
+	.boot_params = MX25_PHYS_OFFSET + 0x100,
+	.map_io = mx25_map_io,
+	.init_early = imx25_init_early,
+	.init_irq = mx25_init_irq,
+	.timer = &eukrea_cpuimx25_timer,
+	.init_machine = eukrea_cpuimx25_init,
 MACHINE_END

arch/arm/mach-imx/mach-imx27_visstrim_m10.c +6 -5

index 40a3666..494723b 100644
@@ -251,9 +251,10 @@ static struct sys_timer visstrim_m10_timer = {
 };
 
 MACHINE_START(IMX27_VISSTRIM_M10, "Vista Silicon Visstrim_M10")
-	.boot_params    = MX27_PHYS_OFFSET + 0x100,
-	.map_io         = mx27_map_io,
-	.init_irq       = mx27_init_irq,
-	.init_machine   = visstrim_m10_board_init,
-	.timer          = &visstrim_m10_timer,
+	.boot_params = MX27_PHYS_OFFSET + 0x100,
+	.map_io = mx27_map_io,
+	.init_early = imx27_init_early,
+	.init_irq = mx27_init_irq,
+	.timer = &visstrim_m10_timer,
+	.init_machine = visstrim_m10_board_init,
 MACHINE_END

arch/arm/mach-imx/mach-imx27ipcam.c +6 -5

index d099ea6..9be6cd6 100644
@@ -69,9 +69,10 @@ static struct sys_timer mx27ipcam_timer = {
 
 MACHINE_START(IMX27IPCAM, "Freescale IMX27IPCAM")
 	/* maintainer: Freescale Semiconductor, Inc. */
-	.boot_params    = MX27_PHYS_OFFSET + 0x100,
-	.map_io         = mx27_map_io,
-	.init_irq       = mx27_init_irq,
-	.init_machine   = mx27ipcam_init,
-	.timer          = &mx27ipcam_timer,
+	.boot_params = MX27_PHYS_OFFSET + 0x100,
+	.map_io = mx27_map_io,
+	.init_early = imx27_init_early,
+	.init_irq = mx27_init_irq,
+	.timer = &mx27ipcam_timer,
+	.init_machine = mx27ipcam_init,
 MACHINE_END

arch/arm/mach-imx/mach-imx27lite.c +6 -5

index 3a1202e..8411405 100644
@@ -75,9 +75,10 @@ static struct sys_timer mx27lite_timer = {
 };
 
 MACHINE_START(IMX27LITE, "LogicPD i.MX27LITE")
-	.boot_params    = MX27_PHYS_OFFSET + 0x100,
-	.map_io         = mx27_map_io,
-	.init_irq       = mx27_init_irq,
-	.init_machine   = mx27lite_init,
-	.timer          = &mx27lite_timer,
+	.boot_params = MX27_PHYS_OFFSET + 0x100,
+	.map_io = mx27_map_io,
+	.init_early = imx27_init_early,
+	.init_irq = mx27_init_irq,
+	.timer = &mx27lite_timer,
+	.init_machine = mx27lite_init,
 MACHINE_END

arch/arm/mach-imx/mach-mx1ads.c +12 ~~-10~~

index 1f446e5..47cf56a 100644
@@ -144,17 +144,19 @@ struct sys_timer mx1ads_timer = {
 
 MACHINE_START(MX1ADS, "Freescale MX1ADS")
 	/* Maintainer: Sascha Hauer, Pengutronix */
-	.boot_params	= MX1_PHYS_OFFSET + 0x100,
-	.map_io		= mx1_map_io,
-	.init_irq	= mx1_init_irq,
-	.timer		= &mx1ads_timer,
-	.init_machine	= mx1ads_init,
+	.boot_params = MX1_PHYS_OFFSET + 0x100,
+	.map_io = mx1_map_io,
+	.init_early = imx1_init_early,
+	.init_irq = mx1_init_irq,
+	.timer = &mx1ads_timer,
+	.init_machine = mx1ads_init,
 MACHINE_END
 
 MACHINE_START(MXLADS, "Freescale MXLADS")
-	.boot_params	= MX1_PHYS_OFFSET + 0x100,
-	.map_io		= mx1_map_io,
-	.init_irq	= mx1_init_irq,
-	.timer		= &mx1ads_timer,
-	.init_machine	= mx1ads_init,
+	.boot_params = MX1_PHYS_OFFSET + 0x100,
+	.map_io = mx1_map_io,
+	.init_early = imx1_init_early,
+	.init_irq = mx1_init_irq,
+	.timer = &mx1ads_timer,
+	.init_machine = mx1ads_init,
 MACHINE_END

arch/arm/mach-imx/mach-mx21ads.c +6 -5

index 0a37257..fa52a10 100644
@@ -304,9 +304,10 @@ static struct sys_timer mx21ads_timer = {
 
 MACHINE_START(MX21ADS, "Freescale i.MX21ADS")
 	/* maintainer: Freescale Semiconductor, Inc. */
-	.boot_params    = MX21_PHYS_OFFSET + 0x100,
-	.map_io         = mx21ads_map_io,
-	.init_irq       = mx21_init_irq,
-	.init_machine   = mx21ads_board_init,
-	.timer          = &mx21ads_timer,
+	.boot_params = MX21_PHYS_OFFSET + 0x100,
+	.map_io = mx21ads_map_io,
+	.init_early = imx21_init_early,
+	.init_irq = mx21_init_irq,
+	.timer = &mx21ads_timer,
+	.init_machine = mx21ads_board_init,
 MACHINE_END

arch/arm/mach-imx/mach-mx25_3ds.c +6 -6

index aa76cfd..0c92a80 100644
@@ -226,10 +226,10 @@ static struct sys_timer mx25pdk_timer = {
 
 MACHINE_START(MX25_3DS, "Freescale MX25PDK (3DS)")
 	/* Maintainer: Freescale Semiconductor, Inc. */
-	.boot_params    = MX25_PHYS_OFFSET + 0x100,
-	.map_io         = mx25_map_io,
-	.init_irq       = mx25_init_irq,
-	.init_machine   = mx25pdk_init,
-	.timer          = &mx25pdk_timer,
+	.boot_params = MX25_PHYS_OFFSET + 0x100,
+	.map_io = mx25_map_io,
+	.init_early = imx25_init_early,
+	.init_irq = mx25_init_irq,
+	.timer = &mx25pdk_timer,
+	.init_machine = mx25pdk_init,
 MACHINE_END
-

arch/arm/mach-imx/mach-mx27_3ds.c +6 -5

index 1643315..92fa7c1 100644
@@ -295,9 +295,10 @@ static struct sys_timer mx27pdk_timer = {
 
 MACHINE_START(MX27_3DS, "Freescale MX27PDK")
 	/* maintainer: Freescale Semiconductor, Inc. */
-	.boot_params    = MX27_PHYS_OFFSET + 0x100,
-	.map_io         = mx27_map_io,
-	.init_irq       = mx27_init_irq,
-	.init_machine   = mx27pdk_init,
-	.timer          = &mx27pdk_timer,
+	.boot_params = MX27_PHYS_OFFSET + 0x100,
+	.map_io = mx27_map_io,
+	.init_early = imx27_init_early,
+	.init_irq = mx27_init_irq,
+	.timer = &mx27pdk_timer,
+	.init_machine = mx27pdk_init,
 MACHINE_END

arch/arm/mach-imx/mach-mx27ads.c +6 -5

index b832f96..367d1e4 100644
@@ -344,9 +344,10 @@ static void __init mx27ads_map_io(void)
 
 MACHINE_START(MX27ADS, "Freescale i.MX27ADS")
 	/* maintainer: Freescale Semiconductor, Inc. */
-	.boot_params    = MX27_PHYS_OFFSET + 0x100,
-	.map_io         = mx27ads_map_io,
-	.init_irq       = mx27_init_irq,
-	.init_machine   = mx27ads_board_init,
-	.timer          = &mx27ads_timer,
+	.boot_params = MX27_PHYS_OFFSET + 0x100,
+	.map_io = mx27ads_map_io,
+	.init_early = imx27_init_early,
+	.init_irq = mx27_init_irq,
+	.timer = &mx27ads_timer,
+	.init_machine = mx27ads_board_init,
 MACHINE_END

arch/arm/mach-imx/mach-mxt_td60.c +6 -6

index 4ce71b0..69787c3 100644
@@ -266,10 +266,10 @@ static struct sys_timer mxt_td60_timer = {
 
 MACHINE_START(MXT_TD60, "Maxtrack i-MXT TD60")
 	/* maintainer: Maxtrack Industrial */
-	.boot_params	= MX27_PHYS_OFFSET + 0x100,
-	.map_io		= mx27_map_io,
-	.init_irq	= mx27_init_irq,
-	.init_machine	= mxt_td60_board_init,
-	.timer		= &mxt_td60_timer,
+	.boot_params = MX27_PHYS_OFFSET + 0x100,
+	.map_io = mx27_map_io,
+	.init_early = imx27_init_early,
+	.init_irq = mx27_init_irq,
+	.timer = &mxt_td60_timer,
+	.init_machine = mxt_td60_board_init,
 MACHINE_END
-

arch/arm/mach-imx/mach-pca100.c +6 -6

index faa4e04..3514178 100644
@@ -433,10 +433,10 @@ static struct sys_timer pca100_timer = {
 };
 
 MACHINE_START(PCA100, "phyCARD-i.MX27")
-	.boot_params    = MX27_PHYS_OFFSET + 0x100,
-	.map_io         = mx27_map_io,
-	.init_irq       = mx27_init_irq,
-	.init_machine   = pca100_init,
-	.timer          = &pca100_timer,
+	.boot_params = MX27_PHYS_OFFSET + 0x100,
+	.map_io = mx27_map_io,
+	.init_early = imx27_init_early,
+	.init_irq = mx27_init_irq,
+	.init_machine = pca100_init,
+	.timer = &pca100_timer,
 MACHINE_END
-

arch/arm/mach-imx/mach-pcm038.c +6 -5

index 5056148..11b6a8e 100644
@@ -340,9 +340,10 @@ static struct sys_timer pcm038_timer = {
 };
 
 MACHINE_START(PCM038, "phyCORE-i.MX27")
-	.boot_params    = MX27_PHYS_OFFSET + 0x100,
-	.map_io         = mx27_map_io,
-	.init_irq       = mx27_init_irq,
-	.init_machine   = pcm038_init,
-	.timer          = &pcm038_timer,
+	.boot_params = MX27_PHYS_OFFSET + 0x100,
+	.map_io = mx27_map_io,
+	.init_early = imx27_init_early,
+	.init_irq = mx27_init_irq,
+	.timer = &pcm038_timer,
+	.init_machine = pcm038_init,
 MACHINE_END

arch/arm/mach-imx/mach-scb9328.c +7 -6

index eae878f..dcaee04 100644
@@ -145,10 +145,11 @@ static struct sys_timer scb9328_timer = {
 };
 
 MACHINE_START(SCB9328, "Synertronixx scb9328")
-    /* Sascha Hauer */
-	.boot_params	= 0x08000100,
-	.map_io		= mx1_map_io,
-	.init_irq	= mx1_init_irq,
-	.timer		= &scb9328_timer,
-	.init_machine	= scb9328_init,
+	/* Sascha Hauer */
+	.boot_params = 0x08000100,
+	.map_io = mx1_map_io,
+	.init_early = imx1_init_early,
+	.init_irq = mx1_init_irq,
+	.timer = &scb9328_timer,
+	.init_machine = scb9328_init,
 MACHINE_END

arch/arm/mach-imx/mm-imx1.c +5 -2

index 729ae09..378c61b 100644
@@ -30,10 +30,13 @@ static struct map_desc imx_io_desc[] __initdata = {
 
 void __init mx1_map_io(void)
 {
+	iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc));
+}
+
+void __init imx1_init_early(void)
+{
 	mxc_set_cpu_type(MXC_CPU_MX1);
 	mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR));
-
-	iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc));
 }
 
 int imx1_register_gpios(void);

arch/arm/mach-imx/mm-imx21.c +5 -2

index e728af8..b6152c6 100644
@@ -56,10 +56,13 @@ static struct map_desc imx21_io_desc[] __initdata = {
  */
 void __init mx21_map_io(void)
 {
+	iotable_init(imx21_io_desc, ARRAY_SIZE(imx21_io_desc));
+}
+
+void __init imx21_init_early(void)
+{
 	mxc_set_cpu_type(MXC_CPU_MX21);
 	mxc_arch_reset_init(MX21_IO_ADDRESS(MX21_WDOG_BASE_ADDR));
-
-	iotable_init(imx21_io_desc, ARRAY_SIZE(imx21_io_desc));
 }
 
 int imx21_register_gpios(void);

arch/arm/mach-imx/mm-imx25.c +5 -2

index 2edec6c..09dd8d4 100644
@@ -45,11 +45,14 @@ static struct map_desc mx25_io_desc[] __initdata = {
  */
 void __init mx25_map_io(void)
 {
+	iotable_init(mx25_io_desc, ARRAY_SIZE(mx25_io_desc));
+}
+
+void __init imx25_init_early(void)
+{
 	mxc_set_cpu_type(MXC_CPU_MX25);
 	mxc_iomux_v3_init(MX25_IO_ADDRESS(MX25_IOMUXC_BASE_ADDR));
 	mxc_arch_reset_init(MX25_IO_ADDRESS(MX25_WDOG_BASE_ADDR));
-
-	iotable_init(mx25_io_desc, ARRAY_SIZE(mx25_io_desc));
 }
 
 int imx25_register_gpios(void);

arch/arm/mach-imx/mm-imx27.c +5 -2

index 374e48b..bcaa3b6 100644
@@ -56,10 +56,13 @@ static struct map_desc imx27_io_desc[] __initdata = {
  */
 void __init mx27_map_io(void)
 {
+	iotable_init(imx27_io_desc, ARRAY_SIZE(imx27_io_desc));
+}
+
+void __init imx27_init_early(void)
+{
 	mxc_set_cpu_type(MXC_CPU_MX27);
 	mxc_arch_reset_init(MX27_IO_ADDRESS(MX27_WDOG_BASE_ADDR));
-
-	iotable_init(imx27_io_desc, ARRAY_SIZE(imx27_io_desc));
 }
 
 int imx27_register_gpios(void);

arch/arm/plat-mxc/include/mach/common.h +4 -0

index aea2cd3..e4f1de0 100644
@@ -24,6 +24,10 @@ extern void mx50_map_io(void);
 extern void mx51_map_io(void);
 extern void mx53_map_io(void);
 extern void mxc91231_map_io(void);
+extern void imx1_init_early(void);
+extern void imx21_init_early(void);
+extern void imx25_init_early(void);
+extern void imx27_init_early(void);
 extern void mxc_init_irq(void __iomem *);
 extern void tzic_init_irq(void __iomem *);
 extern void mx1_init_irq(void);

Signature · 1 line

1.7.2.3

Uwe Kleine-König

2011-02-07 15:35 UTC #24 lore raw

PATCH 2/4 ARM: mx3: use .init_early to initialize cpu type, reset address and iomuxer

In reply to Russell King - ARM Linux

This used to be done in .map_io which is supposed to only setup the memory mapping.

Signed-off-by Uwe Kleine-K?nig <[email protected]>

---
 arch/arm/mach-mx3/mach-armadillo5x0.c   |   11 ++++++-----
 arch/arm/mach-mx3/mach-cpuimx35.c       |   11 ++++++-----
 arch/arm/mach-mx3/mach-kzm_arm11_01.c   |   11 ++++++-----
 arch/arm/mach-mx3/mach-mx31_3ds.c       |   11 ++++++-----
 arch/arm/mach-mx3/mach-mx31ads.c        |   11 ++++++-----
 arch/arm/mach-mx3/mach-mx31lilly.c      |   12 ++++++------
 arch/arm/mach-mx3/mach-mx31lite.c       |   11 ++++++-----
 arch/arm/mach-mx3/mach-mx31moboard.c    |   12 ++++++------
 arch/arm/mach-mx3/mach-mx35_3ds.c       |   11 ++++++-----
 arch/arm/mach-mx3/mach-pcm037.c         |   11 ++++++-----
 arch/arm/mach-mx3/mach-pcm043.c         |   12 ++++++------
 arch/arm/mach-mx3/mach-qong.c           |   11 ++++++-----
 arch/arm/mach-mx3/mach-vpr200.c         |    9 +++++----
 arch/arm/mach-mx3/mm.c                  |   14 ++++++++++----
 arch/arm/plat-mxc/include/mach/common.h |    3 +++
 15 files changed, 90 insertions(+), 71 deletions(-)

arch/arm/mach-mx3/mach-armadillo5x0.c +6 -5

index 28b6f41..835e2a0 100644
@@ -569,9 +569,10 @@ static struct sys_timer armadillo5x0_timer = {
 
 MACHINE_START(ARMADILLO5X0, "Armadillo-500")
 	/* Maintainer: Alberto Panizzo  */
-	.boot_params	= MX3x_PHYS_OFFSET + 0x100,
-	.map_io		= mx31_map_io,
-	.init_irq	= mx31_init_irq,
-	.timer		= &armadillo5x0_timer,
-	.init_machine	= armadillo5x0_init,
+	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+	.map_io = mx31_map_io,
+	.init_early = imx31_init_early,
+	.init_irq = mx31_init_irq,
+	.timer = &armadillo5x0_timer,
+	.init_machine = armadillo5x0_init,
 MACHINE_END

arch/arm/mach-mx3/mach-cpuimx35.c +6 -5

index 26ae90f..3eedf0f 100644
@@ -184,9 +184,10 @@ struct sys_timer eukrea_cpuimx35_timer = {
 
 MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35")
 	/* Maintainer: Eukrea Electromatique */
-	.boot_params    = MX3x_PHYS_OFFSET + 0x100,
-	.map_io         = mx35_map_io,
-	.init_irq       = mx35_init_irq,
-	.init_machine   = mxc_board_init,
-	.timer          = &eukrea_cpuimx35_timer,
+	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+	.map_io = mx35_map_io,
+	.init_ext3_fs = imx35_init_early,
+	.init_irq = mx35_init_irq,
+	.timer = &eukrea_cpuimx35_timer,
+	.init_machine = mxc_board_init,
 MACHINE_END

arch/arm/mach-mx3/mach-kzm_arm11_01.c +6 -5

index a5f3eb2..52b8dd7 100644
@@ -274,9 +274,10 @@ static struct sys_timer kzm_timer = {
  * initialize __mach_desc_KZM_ARM11_01 data structure.
  */
 MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01")
-	.boot_params    = MX3x_PHYS_OFFSET + 0x100,
-	.map_io         = kzm_map_io,
-	.init_irq       = mx31_init_irq,
-	.init_machine   = kzm_board_init,
-	.timer          = &kzm_timer,
+	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+	.map_io = kzm_map_io,
+	.init_early = imx31_init_early,
+	.init_irq = mx31_init_irq,
+	.timer = &kzm_timer,
+	.init_machine = kzm_board_init,
 MACHINE_END

arch/arm/mach-mx3/mach-mx31_3ds.c +6 -5

index 2f41430..2646467 100644
@@ -373,9 +373,10 @@ static struct sys_timer mx31_3ds_timer = {
  */
 MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")
 	/* Maintainer: Freescale Semiconductor, Inc. */
-	.boot_params    = MX3x_PHYS_OFFSET + 0x100,
-	.map_io         = mx31_map_io,
-	.init_irq       = mx31_init_irq,
-	.init_machine   = mxc_board_init,
-	.timer          = &mx31_3ds_timer,
+	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+	.map_io = mx31_map_io,
+	.init_early = imx31_init_early,
+	.init_irq = mx31_init_irq,
+	.timer = &mx31_3ds_timer,
+	.init_machine = mxc_board_init,
 MACHINE_END

arch/arm/mach-mx3/mach-mx31ads.c +6 -5

index e40eb6e..787bdc4 100644
@@ -550,9 +550,10 @@ static struct sys_timer mx31ads_timer = {
  */
 MACHINE_START(MX31ADS, "Freescale MX31ADS")
 	/* Maintainer: Freescale Semiconductor, Inc. */
-	.boot_params    = MX3x_PHYS_OFFSET + 0x100,
-	.map_io         = mx31ads_map_io,
-	.init_irq       = mx31ads_init_irq,
-	.init_machine   = mxc_board_init,
-	.timer          = &mx31ads_timer,
+	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+	.map_io = mx31ads_map_io,
+	.init_early = imx31_init_early,
+	.init_irq = mx31ads_init_irq,
+	.timer = &mx31ads_timer,
+	.init_machine = mxc_board_init,
 MACHINE_END

arch/arm/mach-mx3/mach-mx31lilly.c +6 -6

index 2c59548..25e143a 100644
@@ -347,10 +347,10 @@ static struct sys_timer mx31lilly_timer = {
 };
 
 MACHINE_START(LILLY1131, "INCO startec LILLY-1131")
-	.boot_params	= MX3x_PHYS_OFFSET + 0x100,
-	.map_io		= mx31_map_io,
-	.init_irq	= mx31_init_irq,
-	.init_machine	= mx31lilly_board_init,
-	.timer		= &mx31lilly_timer,
+	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+	.map_io = mx31_map_io,
+	.init_early = imx31_init_early,
+	.init_irq = mx31_init_irq,
+	.timer = &mx31lilly_timer,
+	.init_machine = mx31lilly_board_init,
 MACHINE_END
-

arch/arm/mach-mx3/mach-mx31lite.c +6 -5

index 9e64c66..c03c77d 100644
@@ -281,9 +281,10 @@ struct sys_timer mx31lite_timer = {
 
 MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM")
 	/* Maintainer: Freescale Semiconductor, Inc. */
-	.boot_params    = MX3x_PHYS_OFFSET + 0x100,
-	.map_io         = mx31lite_map_io,
-	.init_irq       = mx31_init_irq,
-	.init_machine   = mxc_board_init,
-	.timer          = &mx31lite_timer,
+	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+	.map_io = mx31lite_map_io,
+	.init_early = imx31_init_early,
+	.init_irq = mx31_init_irq,
+	.timer = &mx31lite_timer,
+	.init_machine = mxc_board_init,
 MACHINE_END

arch/arm/mach-mx3/mach-mx31moboard.c +6 -6

index 1aa8d65..ea72480 100644
@@ -564,10 +564,10 @@ struct sys_timer mx31moboard_timer = {
 
 MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard")
 	/* Maintainer: Valentin Longchamp, EPFL Mobots group */
-	.boot_params    = MX3x_PHYS_OFFSET + 0x100,
-	.map_io         = mx31_map_io,
-	.init_irq       = mx31_init_irq,
-	.init_machine   = mxc_board_init,
-	.timer          = &mx31moboard_timer,
+	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+	.map_io = mx31_map_io,
+	.init_early = imx31_init_early,
+	.init_irq = mx31_init_irq,
+	.timer = &mx31moboard_timer,
+	.init_machine = mxc_board_init,
 MACHINE_END
-

arch/arm/mach-mx3/mach-mx35_3ds.c +6 -5

index b1963f2..c5115dc 100644
@@ -193,9 +193,10 @@ struct sys_timer mx35pdk_timer = {
 
 MACHINE_START(MX35_3DS, "Freescale MX35PDK")
 	/* Maintainer: Freescale Semiconductor, Inc */
-	.boot_params    = MX3x_PHYS_OFFSET + 0x100,
-	.map_io         = mx35_map_io,
-	.init_irq       = mx35_init_irq,
-	.init_machine   = mxc_board_init,
-	.timer          = &mx35pdk_timer,
+	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+	.map_io = mx35_map_io,
+	.init_early = imx35_init_early,
+	.init_irq = mx35_init_irq,
+	.timer = &mx35pdk_timer,
+	.init_machine = mxc_board_init,
 MACHINE_END

arch/arm/mach-mx3/mach-pcm037.c +6 -5

index b752f6b..7d444f7 100644
@@ -675,9 +675,10 @@ struct sys_timer pcm037_timer = {
 
 MACHINE_START(PCM037, "Phytec Phycore pcm037")
 	/* Maintainer: Pengutronix */
-	.boot_params    = MX3x_PHYS_OFFSET + 0x100,
-	.map_io         = mx31_map_io,
-	.init_irq       = mx31_init_irq,
-	.init_machine   = mxc_board_init,
-	.timer          = &pcm037_timer,
+	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+	.map_io = mx31_map_io,
+	.init_early = imx31_init_early,
+	.init_irq = mx31_init_irq,
+	.timer = &pcm037_timer,
+	.init_machine = mxc_board_init,
 MACHINE_END

arch/arm/mach-mx3/mach-pcm043.c +6 -6

index a515290..b03e19d 100644
@@ -403,10 +403,10 @@ struct sys_timer pcm043_timer = {
 
 MACHINE_START(PCM043, "Phytec Phycore pcm043")
 	/* Maintainer: Pengutronix */
-	.boot_params    = MX3x_PHYS_OFFSET + 0x100,
-	.map_io         = mx35_map_io,
-	.init_irq       = mx35_init_irq,
-	.init_machine   = mxc_board_init,
-	.timer          = &pcm043_timer,
+	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+	.map_io = mx35_map_io,
+	.init_early = imx35_init_early,
+	.init_irq = mx35_init_irq,
+	.timer = &pcm043_timer,
+	.init_machine = mxc_board_init,
 MACHINE_END
-

arch/arm/mach-mx3/mach-qong.c +6 -5

index fd1050c..064f2db 100644
@@ -270,9 +270,10 @@ static struct sys_timer qong_timer = {
 
 MACHINE_START(QONG, "Dave/DENX QongEVB-LITE")
 	/* Maintainer: DENX Software Engineering GmbH */
-	.boot_params    = MX3x_PHYS_OFFSET + 0x100,
-	.map_io         = mx31_map_io,
-	.init_irq       = mx31_init_irq,
-	.init_machine   = mxc_board_init,
-	.timer          = &qong_timer,
+	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+	.map_io = mx31_map_io,
+	.init_early = imx31_init_early,
+	.init_irq = mx31_init_irq,
+	.timer = &qong_timer,
+	.init_machine = mxc_board_init,
 MACHINE_END

arch/arm/mach-mx3/mach-vpr200.c +5 -4

index 22ec78a..2cf390f 100644
@@ -320,8 +320,9 @@ struct sys_timer vpr200_timer = {
 
 MACHINE_START(VPR200, "VPR200")
 	/* Maintainer: Creative Product Design */
-	.map_io         = mx35_map_io,
-	.init_irq       = mx35_init_irq,
-	.init_machine   = vpr200_board_init,
-	.timer          = &vpr200_timer,
+	.map_io = mx35_map_io,
+	.init_early = imx35_init_early,
+	.init_irq = mx35_init_irq,
+	.timer = &vpr200_timer,
+	.init_machine = vpr200_board_init,
 MACHINE_END

arch/arm/mach-mx3/mm.c +10 -4

index 47118f7..3387319 100644
@@ -52,10 +52,13 @@ static struct map_desc mx31_io_desc[] __initdata = {
  */
 void __init mx31_map_io(void)
 {
+	iotable_init(mx31_io_desc, ARRAY_SIZE(mx31_io_desc));
+}
+
+void __init imx31_init_early(void)
+{
 	mxc_set_cpu_type(MXC_CPU_MX31);
 	mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR));
-
-	iotable_init(mx31_io_desc, ARRAY_SIZE(mx31_io_desc));
 }
 
 int imx31_register_gpios(void);

@@ -77,11 +80,14 @@ static struct map_desc mx35_io_desc[] __initdata = {
 
 void __init mx35_map_io(void)
 {
+	iotable_init(mx35_io_desc, ARRAY_SIZE(mx35_io_desc));
+}
+
+void __init imx35_init_early(void)
+{
 	mxc_set_cpu_type(MXC_CPU_MX35);
 	mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR));
 	mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR));
-
-	iotable_init(mx35_io_desc, ARRAY_SIZE(mx35_io_desc));
 }
 
 int imx35_register_gpios(void);

arch/arm/plat-mxc/include/mach/common.h +3 -0

index e4f1de0..857eebf47 100644
@@ -28,6 +28,9 @@ extern void imx1_init_early(void);
 extern void imx21_init_early(void);
 extern void imx25_init_early(void);
 extern void imx27_init_early(void);
+extern void imx31_init_early(void);
+extern void imx35_init_early(void);
+extern void imx50_init_early(void);
 extern void mxc_init_irq(void __iomem *);
 extern void tzic_init_irq(void __iomem *);
 extern void mx1_init_irq(void);

Signature · 1 line

1.7.2.3

Uwe Kleine-König

2011-02-07 15:35 UTC #25 lore raw

PATCH 3/4 ARM: mx5: use .init_early to initialize cpu type, reset address and iomuxer

In reply to Russell King - ARM Linux

This used to be done in .map_io which is supposed to only setup the memory mapping.

Signed-off-by Uwe Kleine-K?nig <[email protected]>

---
 arch/arm/mach-mx5/board-cpuimx51.c      |    3 ++-
 arch/arm/mach-mx5/board-cpuimx51sd.c    |    3 ++-
 arch/arm/mach-mx5/board-mx50_rdp.c      |    3 ++-
 arch/arm/mach-mx5/board-mx51_3ds.c      |    3 ++-
 arch/arm/mach-mx5/board-mx51_babbage.c  |    3 ++-
 arch/arm/mach-mx5/board-mx51_efikamx.c  |    3 ++-
 arch/arm/mach-mx5/board-mx53_evk.c      |    3 ++-
 arch/arm/mach-mx5/board-mx53_loco.c     |    3 ++-
 arch/arm/mach-mx5/board-mx53_smd.c      |    3 ++-
 arch/arm/mach-mx5/mm-mx50.c             |    6 +++++-
 arch/arm/mach-mx5/mm.c                  |   12 ++++++++++--
 arch/arm/plat-mxc/include/mach/common.h |    2 ++
 12 files changed, 35 insertions(+), 12 deletions(-)

arch/arm/mach-mx5/board-cpuimx51.c +2 -1

index f576a97..2d4199d 100644
@@ -294,7 +294,8 @@ MACHINE_START(EUKREA_CPUIMX51, "Eukrea CPUIMX51 Module")
 	/* Maintainer: Eric B?nard <[email protected]> */
 	.boot_params = MX51_PHYS_OFFSET + 0x100,
 	.map_io = mx51_map_io,
+	.init_early = imx51_init_early,
 	.init_irq = mx51_init_irq,
-	.init_machine = eukrea_cpuimx51_init,
 	.timer = &mxc_timer,
+	.init_machine = eukrea_cpuimx51_init,
 MACHINE_END

arch/arm/mach-mx5/board-cpuimx51sd.c +2 -1

index ad93189..6c3b445 100644
@@ -329,7 +329,8 @@ MACHINE_START(EUKREA_CPUIMX51SD, "Eukrea CPUIMX51SD")
 	/* Maintainer: Eric B?nard <[email protected]> */
 	.boot_params = MX51_PHYS_OFFSET + 0x100,
 	.map_io = mx51_map_io,
+	.init_early = imx51_init_early,
 	.init_irq = mx51_init_irq,
-	.init_machine = eukrea_cpuimx51sd_init,
 	.timer = &mxc_timer,
+	.init_machine = eukrea_cpuimx51sd_init,
 MACHINE_END

arch/arm/mach-mx5/board-mx50_rdp.c +2 -1

index 75beef7..dedf7f2 100644
@@ -216,7 +216,8 @@ static struct sys_timer mx50_rdp_timer = {
 
 MACHINE_START(MX50_RDP, "Freescale MX50 Reference Design Platform")
 	.map_io = mx50_map_io,
+	.init_early = imx50_init_early,
 	.init_irq = mx50_init_irq,
-	.init_machine = mx50_rdp_board_init,
 	.timer = &mx50_rdp_timer,
+	.init_machine = mx50_rdp_board_init,
 MACHINE_END

arch/arm/mach-mx5/board-mx51_3ds.c +2 -1

index 55d5746..0168470 100644
@@ -168,7 +168,8 @@ MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board")
 	/* Maintainer: Freescale Semiconductor, Inc. */
 	.boot_params = MX51_PHYS_OFFSET + 0x100,
 	.map_io = mx51_map_io,
+	.init_early = imx51_init_early,
 	.init_irq = mx51_init_irq,
-	.init_machine = mxc_board_init,
 	.timer = &mxc_timer,
+	.init_machine = mxc_board_init,
 MACHINE_END

arch/arm/mach-mx5/board-mx51_babbage.c +2 -1

index d9d402e..2bd9c9e 100644
@@ -398,7 +398,8 @@ MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")
 	/* Maintainer: Amit Kucheria <[email protected]> */
 	.boot_params = MX51_PHYS_OFFSET + 0x100,
 	.map_io = mx51_map_io,
+	.init_early = imx51_init_early,
 	.init_irq = mx51_init_irq,
-	.init_machine = mxc_board_init,
 	.timer = &mxc_timer,
+	.init_machine = mxc_board_init,
 MACHINE_END

arch/arm/mach-mx5/board-mx51_efikamx.c +2 -1

index e237040..2aac4c5 100644
@@ -347,7 +347,8 @@ MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
 	/* Maintainer: Amit Kucheria <[email protected]> */
 	.boot_params = MX51_PHYS_OFFSET + 0x100,
 	.map_io = mx51_map_io,
+	.init_early = imx51_init_early,
 	.init_irq = mx51_init_irq,
-	.init_machine =  mxc_board_init,
 	.timer = &mxc_timer,
+	.init_machine =  mxc_board_init,
 MACHINE_END

arch/arm/mach-mx5/board-mx53_evk.c +2 -1

index 4978007..8ed316b 100644
@@ -150,7 +150,8 @@ static struct sys_timer mx53_evk_timer = {
 
 MACHINE_START(MX53_EVK, "Freescale MX53 EVK Board")
 	.map_io = mx53_map_io,
+	.init_early = imx53_init_early,
 	.init_irq = mx53_init_irq,
-	.init_machine = mx53_evk_board_init,
 	.timer = &mx53_evk_timer,
+	.init_machine = mx53_evk_board_init,
 MACHINE_END

arch/arm/mach-mx5/board-mx53_loco.c +2 -1

index 3aefd6d..0fea252 100644
@@ -82,7 +82,8 @@ static struct sys_timer mx53_loco_timer = {
 
 MACHINE_START(MX53_LOCO, "Freescale MX53 LOCO Board")
 	.map_io = mx53_map_io,
+	.init_early = imx53_init_early,
 	.init_irq = mx53_init_irq,
-	.init_machine = mx53_loco_board_init,
 	.timer = &mx53_loco_timer,
+	.init_machine = mx53_loco_board_init,
 MACHINE_END

arch/arm/mach-mx5/board-mx53_smd.c +2 -1

index c7b45d4..fa0fad8 100644
@@ -103,7 +103,8 @@ static struct sys_timer mx53_smd_timer = {
 
 MACHINE_START(MX53_SMD, "Freescale MX53 SMD Board")
 	.map_io = mx53_map_io,
+	.init_early = imx53_init_early,
 	.init_irq = mx53_init_irq,
-	.init_machine = mx53_smd_board_init,
 	.timer = &mx53_smd_timer,
+	.init_machine = mx53_smd_board_init,
 MACHINE_END

arch/arm/mach-mx5/mm-mx50.c +5 -1

index 8c6540e..69b3426 100644
@@ -44,10 +44,14 @@ static struct map_desc mx50_io_desc[] __initdata = {
  */
 void __init mx50_map_io(void)
 {
+	iotable_init(mx50_io_desc, ARRAY_SIZE(mx50_io_desc));
+}
+
+void __init imx50_init_early(void)
+{
 	mxc_set_cpu_type(MXC_CPU_MX50);
 	mxc_iomux_v3_init(MX50_IO_ADDRESS(MX50_IOMUXC_BASE_ADDR));
 	mxc_arch_reset_init(MX50_IO_ADDRESS(MX50_WDOG_BASE_ADDR));
-	iotable_init(mx50_io_desc, ARRAY_SIZE(mx50_io_desc));
 }
 
 int imx50_register_gpios(void);

arch/arm/mach-mx5/mm.c +10 -2

index 457f9f9..8730cd1 100644
@@ -47,18 +47,26 @@ static struct map_desc mx53_io_desc[] __initdata = {
  */
 void __init mx51_map_io(void)
 {
+	iotable_init(mx51_io_desc, ARRAY_SIZE(mx51_io_desc));
+}
+
+void __init imx51_init_early(void)
+{
 	mxc_set_cpu_type(MXC_CPU_MX51);
 	mxc_iomux_v3_init(MX51_IO_ADDRESS(MX51_IOMUXC_BASE_ADDR));
 	mxc_arch_reset_init(MX51_IO_ADDRESS(MX51_WDOG1_BASE_ADDR));
-	iotable_init(mx51_io_desc, ARRAY_SIZE(mx51_io_desc));
 }
 
 void __init mx53_map_io(void)
 {
+	iotable_init(mx53_io_desc, ARRAY_SIZE(mx53_io_desc));
+}
+
+void __init imx53_init_early(void)
+{
 	mxc_set_cpu_type(MXC_CPU_MX53);
 	mxc_iomux_v3_init(MX53_IO_ADDRESS(MX53_IOMUXC_BASE_ADDR));
 	mxc_arch_reset_init(MX53_IO_ADDRESS(MX53_WDOG_BASE_ADDR));
-	iotable_init(mx53_io_desc, ARRAY_SIZE(mx53_io_desc));
 }
 
 int imx51_register_gpios(void);

arch/arm/plat-mxc/include/mach/common.h +2 -0

index 857eebf47..4746b9a 100644
@@ -31,6 +31,8 @@ extern void imx27_init_early(void);
 extern void imx31_init_early(void);
 extern void imx35_init_early(void);
 extern void imx50_init_early(void);
+extern void imx51_init_early(void);
+extern void imx53_init_early(void);
 extern void mxc_init_irq(void __iomem *);
 extern void tzic_init_irq(void __iomem *);
 extern void mx1_init_irq(void);

Signature · 1 line

1.7.2.3

Uwe Kleine-König

2011-02-07 15:35 UTC #26 lore raw

PATCH 4/4 ARM: mxc91231: use .init_early to initialize cpu type

In reply to Russell King - ARM Linux

This used to be done in .map_io which is supposed to only setup the memory mapping.

Signed-off-by Uwe Kleine-K?nig <[email protected]>

---
 arch/arm/mach-mxc91231/magx-zn5.c       |   11 ++++++-----
 arch/arm/mach-mxc91231/mm.c             |    7 +++++--
 arch/arm/plat-mxc/include/mach/common.h |    1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

arch/arm/mach-mxc91231/magx-zn5.c +6 -5

index 395d83b..f31a45e 100644
@@ -53,9 +53,10 @@ struct sys_timer zn5_timer = {
 };
 
 MACHINE_START(MAGX_ZN5, "Motorola Zn5")
-	.boot_params	= MXC91231_PHYS_OFFSET + 0x100,
-	.map_io		= mxc91231_map_io,
-	.init_irq	= mxc91231_init_irq,
-	.timer		= &zn5_timer,
-	.init_machine	= zn5_init,
+	.boot_params = MXC91231_PHYS_OFFSET + 0x100,
+	.map_io = mxc91231_map_io,
+	.init_early = mxc91231_init_early,
+	.init_irq = mxc91231_init_irq,
+	.timer = &zn5_timer,
+	.init_machine = zn5_init,
 MACHINE_END

arch/arm/mach-mxc91231/mm.c +5 -2

index 7652c30..a77f6da 100644
@@ -45,11 +45,14 @@ static struct map_desc mxc91231_io_desc[] __initdata = {
  */
 void __init mxc91231_map_io(void)
 {
-	mxc_set_cpu_type(MXC_CPU_MXC91231);
-
 	iotable_init(mxc91231_io_desc, ARRAY_SIZE(mxc91231_io_desc));
 }
 
+void __init mxc91231_init_early(void)
+{
+	mxc_set_cpu_type(MXC_CPU_MXC91231);
+}
+
 int mxc91231_register_gpios(void);
 
 void __init mxc91231_init_irq(void)

arch/arm/plat-mxc/include/mach/common.h +1 -0

index 4746b9a..a22ebe1 100644
@@ -33,6 +33,7 @@ extern void imx35_init_early(void);
 extern void imx50_init_early(void);
 extern void imx51_init_early(void);
 extern void imx53_init_early(void);
+extern void mxc91231_init_early(void);
 extern void mxc_init_irq(void __iomem *);
 extern void tzic_init_irq(void __iomem *);
 extern void mx1_init_irq(void);

Signature · 1 line

1.7.2.3