aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-ldp.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
-rw-r--r--arch/arm/mach-omap2/board-ldp.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index f8f8a68a4899..e179da0c4da5 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)
251 omap_display_init(&ldp_dss_data); 251 omap_display_init(&ldp_dss_data);
252} 252}
253 253
254static void __init omap_ldp_init_early(void)
255{
256 omap2_init_common_infrastructure();
257 omap2_init_common_devices(NULL, NULL);
258}
259
260static int ldp_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio) 254static int ldp_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio)
261{ 255{
262 int r; 256 int r;
@@ -425,6 +419,7 @@ static void __init omap_ldp_init(void)
425 platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices)); 419 platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices));
426 omap_ads7846_init(1, 54, 310, NULL); 420 omap_ads7846_init(1, 54, 310, NULL);
427 omap_serial_init(); 421 omap_serial_init();
422 omap_sdrc_init(NULL, NULL);
428 usb_musb_init(NULL); 423 usb_musb_init(NULL);
429 board_nand_init(ldp_nand_partitions, 424 board_nand_init(ldp_nand_partitions,
430 ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0); 425 ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0);
@@ -437,7 +432,7 @@ MACHINE_START(OMAP_LDP, "OMAP LDP board")
437 .atag_offset = 0x100, 432 .atag_offset = 0x100,
438 .reserve = omap_reserve, 433 .reserve = omap_reserve,
439 .map_io = omap3_map_io, 434 .map_io = omap3_map_io,
440 .init_early = omap_ldp_init_early, 435 .init_early = omap3430_init_early,
441 .init_irq = omap3_init_irq, 436 .init_irq = omap3_init_irq,
442 .init_machine = omap_ldp_init, 437 .init_machine = omap_ldp_init,
443 .timer = &omap3_timer, 438 .timer = &omap3_timer,