aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-4430sdp.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/board-4430sdp.c')
-rw-r--r--arch/arm/mach-omap2/board-4430sdp.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index a3e37ff3ad18..515646886b59 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -379,12 +379,6 @@ static struct platform_device *sdp4430_devices[] __initdata = {
379 &sdp4430_vbat, 379 &sdp4430_vbat,
380}; 380};
381 381
382static void __init omap_4430sdp_init_early(void)
383{
384 omap2_init_common_infrastructure();
385 omap2_init_common_devices(NULL, NULL);
386}
387
388static struct omap_musb_board_data musb_board_data = { 382static struct omap_musb_board_data musb_board_data = {
389 .interface_type = MUSB_INTERFACE_UTMI, 383 .interface_type = MUSB_INTERFACE_UTMI,
390 .mode = MUSB_OTG, 384 .mode = MUSB_OTG,
@@ -961,6 +955,7 @@ static void __init omap_4430sdp_init(void)
961 omap_sfh7741prox_init(); 955 omap_sfh7741prox_init();
962 platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices)); 956 platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));
963 board_serial_init(); 957 board_serial_init();
958 omap_sdrc_init(NULL, NULL);
964 omap4_sdp4430_wifi_init(); 959 omap4_sdp4430_wifi_init();
965 omap4_twl6030_hsmmc_init(mmc); 960 omap4_twl6030_hsmmc_init(mmc);
966 961
@@ -982,18 +977,12 @@ static void __init omap_4430sdp_init(void)
982 omap_4430sdp_display_init(); 977 omap_4430sdp_display_init();
983} 978}
984 979
985static void __init omap_4430sdp_map_io(void)
986{
987 omap2_set_globals_443x();
988 omap44xx_map_common_io();
989}
990
991MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board") 980MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")
992 /* Maintainer: Santosh Shilimkar - Texas Instruments Inc */ 981 /* Maintainer: Santosh Shilimkar - Texas Instruments Inc */
993 .atag_offset = 0x100, 982 .atag_offset = 0x100,
994 .reserve = omap_reserve, 983 .reserve = omap_reserve,
995 .map_io = omap_4430sdp_map_io, 984 .map_io = omap4_map_io,
996 .init_early = omap_4430sdp_init_early, 985 .init_early = omap4430_init_early,
997 .init_irq = gic_init_irq, 986 .init_irq = gic_init_irq,
998 .init_machine = omap_4430sdp_init, 987 .init_machine = omap_4430sdp_init,
999 .timer = &omap4_timer, 988 .timer = &omap4_timer,