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

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

ARM: OMAP: Move omap2_init_common_devices out of init_early 



There's no need to call omap2_init_common_devices from init_early.

It no longer does anything else except reprogram the memory timings
for some boards, so it's better to do it later so we have a chance
to get console messages if something goes wrong.

Move it to happen after omap_serial_init gets called. And while
patching it anyways, rename it to omap_sdrc_init as suggested by
Benoit Cousson <b-cousson@ti.com>.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ static struct omap_board_config_kernel sdp2430_config[] __initdata = { 
static void __init omap_2430sdp_init_early(void)

{

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

}



static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = {
@@ -235,6 +234,7 @@ static void __init omap_2430sdp_init(void) 


	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));

	omap_serial_init();

	omap_sdrc_init(NULL, NULL);

	omap2_hsmmc_init(mmc);

	omap2_usbfs_init(&sdp2430_usb_config);

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

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ static struct omap_board_config_kernel sdp3430_config[] __initdata = { 
static void __init omap_3430sdp_init_early(void)

{

	omap2_init_common_infrastructure();

	omap2_init_common_devices(hyb18m512160af6_sdrc_params, NULL);

}



static struct omap2_hsmmc_info mmc[] = {
@@ -719,6 +718,7 @@ static void __init omap_3430sdp_init(void) 
		gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;

	omap_ads7846_init(1, gpio_pendown, 310, NULL);

	board_serial_init();

	omap_sdrc_init(hyb18m512160af6_sdrc_params, NULL);

	usb_musb_init(NULL);

	board_smc91x_init();

	board_flash_init(sdp_flash_partitions, chip_sel_3430, 0);

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

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ static struct omap_board_config_kernel sdp_config[] __initdata = { 
static void __init omap_sdp_init_early(void)

{

	omap2_init_common_infrastructure();

	omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params,

				  h8mbx00u0mer0em_sdrc_params);

}



#ifdef CONFIG_OMAP_MUX
@@ -207,6 +205,8 @@ static void __init omap_sdp_init(void) 
	omap_board_config = sdp_config;

	omap_board_config_size = ARRAY_SIZE(sdp_config);

	zoom_peripherals_init();

	omap_sdrc_init(h8mbx00u0mer0em_sdrc_params,

				  h8mbx00u0mer0em_sdrc_params);

	zoom_display_init();

	board_smc91x_init();

	board_flash_init(sdp_flash_partitions, chip_sel_sdp, NAND_BUSWIDTH_16);

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

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,6 @@ static struct omap_board_config_kernel sdp4430_config[] __initdata = { 
static void __init omap_4430sdp_init_early(void)

{

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

}



static struct omap_musb_board_data musb_board_data = {
@@ -809,6 +808,7 @@ static void __init omap_4430sdp_init(void) 
	omap_sfh7741prox_init();

	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));

	board_serial_init();

	omap_sdrc_init(NULL, NULL);

	omap4_sdp4430_wifi_init();

	omap4_twl6030_hsmmc_init(mmc);

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ static struct omap_board_mux board_mux[] __initdata = { 
static void __init am3517_crane_init_early(void)

{

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

}



static struct usbhs_omap_board_data usbhs_bdata __initdata = {
@@ -70,6 +69,7 @@ static void __init am3517_crane_init(void) 


	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap_serial_init();

	omap_sdrc_init(NULL, NULL);



	omap_board_config = am3517_crane_config;

	omap_board_config_size = ARRAY_SIZE(am3517_crane_config);