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

Commit e41cccfe authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap2+: Minimize board specific init_early calls 



We should only call init_common_infrastructure and
init_common_devices from init_early.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e0530460

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -142,8 +142,6 @@ static struct omap_board_config_kernel sdp2430_config[] __initdata = { 




static void __init omap_2430sdp_init_early(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_infrastructure();

	omap2_init_common_devices(NULL, NULL);

	omap2_init_common_devices(NULL, NULL);

}

}
@@ -246,6 +244,9 @@ static void __init omap_2430sdp_init(void) 




	omap2430_mux_init(board_mux, OMAP_PACKAGE_ZAC);

	omap2430_mux_init(board_mux, OMAP_PACKAGE_ZAC);





	omap_board_config = sdp2430_config;

	omap_board_config_size = ARRAY_SIZE(sdp2430_config);



	omap2430_i2c_init();

	omap2430_i2c_init();





	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));

	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -315,9 +315,6 @@ static struct omap_board_config_kernel sdp3430_config[] __initdata = { 




static void __init omap_3430sdp_init_early(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_infrastructure();

	omap2_init_common_devices(hyb18m512160af6_sdrc_params, NULL);

	omap2_init_common_devices(hyb18m512160af6_sdrc_params, NULL);

}

}
@@ -788,6 +785,9 @@ static struct omap_musb_board_data musb_board_data = { 
static void __init omap_3430sdp_init(void)

static void __init omap_3430sdp_init(void)

{

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap_board_config = sdp3430_config;

	omap_board_config_size = ARRAY_SIZE(sdp3430_config);

	omap3_pm_init_cpuidle(omap3_cpuidle_params_table);

	omap3430_i2c_init();

	omap3430_i2c_init();

	omap_display_init(&sdp3430_dss_data);

	omap_display_init(&sdp3430_dss_data);

	if (omap_rev() > OMAP3430_REV_ES1_0)

	if (omap_rev() > OMAP3430_REV_ES1_0)

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -72,8 +72,6 @@ static struct omap_board_config_kernel sdp_config[] __initdata = { 




static void __init omap_sdp_init_early(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_infrastructure();

	omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params,

	omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params,

				  h8mbx00u0mer0em_sdrc_params);

				  h8mbx00u0mer0em_sdrc_params);
@@ -206,6 +204,8 @@ static struct flash_partitions sdp_flash_partitions[] = { 
static void __init omap_sdp_init(void)

static void __init omap_sdp_init(void)

{

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);

	omap_board_config = sdp_config;

	omap_board_config_size = ARRAY_SIZE(sdp_config);

	zoom_peripherals_init();

	zoom_peripherals_init();

	zoom_display_init();

	zoom_display_init();

	board_smc91x_init();

	board_smc91x_init();

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -325,8 +325,6 @@ static struct omap_board_config_kernel sdp4430_config[] __initdata = { 




static void __init omap_4430sdp_init_early(void)

static void __init omap_4430sdp_init_early(void)

{

{

	omap_board_config = sdp4430_config;

	omap_board_config_size = ARRAY_SIZE(sdp4430_config);

	omap2_init_common_infrastructure();

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

	omap2_init_common_devices(NULL, NULL);

#ifdef CONFIG_OMAP_32K_TIMER

#ifdef CONFIG_OMAP_32K_TIMER
@@ -640,6 +638,9 @@ static void __init omap_4430sdp_init(void) 
		package = OMAP_PACKAGE_CBL;

		package = OMAP_PACKAGE_CBL;

	omap4_mux_init(board_mux, package);

	omap4_mux_init(board_mux, package);





	omap_board_config = sdp4430_config;

	omap_board_config_size = ARRAY_SIZE(sdp4430_config);



	omap4_i2c_init();

	omap4_i2c_init();

	omap_sfh7741prox_init();

	omap_sfh7741prox_init();

	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));

	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -51,9 +51,6 @@ static struct omap_board_mux board_mux[] __initdata = { 




static void __init am3517_crane_init_early(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_infrastructure();

	omap2_init_common_devices(NULL, NULL);

	omap2_init_common_devices(NULL, NULL);

}

}
@@ -76,6 +73,9 @@ static void __init am3517_crane_init(void) 
	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap_serial_init();

	omap_serial_init();





	omap_board_config = am3517_crane_config;

	omap_board_config_size = ARRAY_SIZE(am3517_crane_config);



	/* Configure GPIO for EHCI port */

	/* Configure GPIO for EHCI port */

	if (omap_mux_init_gpio(GPIO_USB_NRESET, OMAP_PIN_OUTPUT)) {

	if (omap_mux_init_gpio(GPIO_USB_NRESET, OMAP_PIN_OUTPUT)) {

		pr_err("Can not configure mux for GPIO_USB_NRESET %d\n",

		pr_err("Can not configure mux for GPIO_USB_NRESET %d\n",