diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-3630sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-3630sdp.c | 13 | 
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index e4f37b57a0c..f552305162f 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c @@ -70,13 +70,6 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = {  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  static struct omap_board_mux board_mux[] __initdata = {  	{ .reg_offset = OMAP_MUX_TERMINATOR }, @@ -207,6 +200,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); @@ -215,10 +210,10 @@ static void __init omap_sdp_init(void)  }  MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board") -	.boot_params	= 0x80000100, +	.atag_offset	= 0x100,  	.reserve	= omap_reserve,  	.map_io		= omap3_map_io, -	.init_early	= omap_sdp_init_early, +	.init_early	= omap3630_init_early,  	.init_irq	= omap3_init_irq,  	.init_machine	= omap_sdp_init,  	.timer		= &omap3_timer,  |