Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dc3bad6 authored by Russell King - ARM Linux's avatar Russell King - ARM Linux Committed by Tony Lindgren
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 100b33c8

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

+4 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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