diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 11 | 
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 689ed499bdf..2a2545153d1 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -251,12 +251,6 @@ static void __init ldp_display_init(void)  	omap_display_init(&ldp_dss_data);  } -static void __init omap_ldp_init_early(void) -{ -	omap2_init_common_infrastructure(); -	omap2_init_common_devices(NULL, NULL); -} -  static int ldp_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio)  {  	int r; @@ -425,6 +419,7 @@ static void __init omap_ldp_init(void)  	platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices));  	omap_ads7846_init(1, 54, 310, NULL);  	omap_serial_init(); +	omap_sdrc_init(NULL, NULL);  	usb_musb_init(NULL);  	board_nand_init(ldp_nand_partitions,  		ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0); @@ -434,10 +429,10 @@ static void __init omap_ldp_init(void)  }  MACHINE_START(OMAP_LDP, "OMAP LDP board") -	.boot_params	= 0x80000100, +	.atag_offset	= 0x100,  	.reserve	= omap_reserve,  	.map_io		= omap3_map_io, -	.init_early	= omap_ldp_init_early, +	.init_early	= omap3430_init_early,  	.init_irq	= omap3_init_irq,  	.init_machine	= omap_ldp_init,  	.timer		= &omap3_timer,  |