diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-3630sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-3630sdp.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index 8b5b5aa751ed..f552305162fc 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 = { | |||
70 | static struct omap_board_config_kernel sdp_config[] __initdata = { | 70 | static struct omap_board_config_kernel sdp_config[] __initdata = { |
71 | }; | 71 | }; |
72 | 72 | ||
73 | static void __init omap_sdp_init_early(void) | ||
74 | { | ||
75 | omap2_init_common_infrastructure(); | ||
76 | omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params, | ||
77 | h8mbx00u0mer0em_sdrc_params); | ||
78 | } | ||
79 | |||
80 | #ifdef CONFIG_OMAP_MUX | 73 | #ifdef CONFIG_OMAP_MUX |
81 | static struct omap_board_mux board_mux[] __initdata = { | 74 | static struct omap_board_mux board_mux[] __initdata = { |
82 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 75 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
@@ -207,6 +200,8 @@ static void __init omap_sdp_init(void) | |||
207 | omap_board_config = sdp_config; | 200 | omap_board_config = sdp_config; |
208 | omap_board_config_size = ARRAY_SIZE(sdp_config); | 201 | omap_board_config_size = ARRAY_SIZE(sdp_config); |
209 | zoom_peripherals_init(); | 202 | zoom_peripherals_init(); |
203 | omap_sdrc_init(h8mbx00u0mer0em_sdrc_params, | ||
204 | h8mbx00u0mer0em_sdrc_params); | ||
210 | zoom_display_init(); | 205 | zoom_display_init(); |
211 | board_smc91x_init(); | 206 | board_smc91x_init(); |
212 | board_flash_init(sdp_flash_partitions, chip_sel_sdp, NAND_BUSWIDTH_16); | 207 | board_flash_init(sdp_flash_partitions, chip_sel_sdp, NAND_BUSWIDTH_16); |
@@ -218,7 +213,7 @@ MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board") | |||
218 | .atag_offset = 0x100, | 213 | .atag_offset = 0x100, |
219 | .reserve = omap_reserve, | 214 | .reserve = omap_reserve, |
220 | .map_io = omap3_map_io, | 215 | .map_io = omap3_map_io, |
221 | .init_early = omap_sdp_init_early, | 216 | .init_early = omap3630_init_early, |
222 | .init_irq = omap3_init_irq, | 217 | .init_irq = omap3_init_irq, |
223 | .init_machine = omap_sdp_init, | 218 | .init_machine = omap_sdp_init, |
224 | .timer = &omap3_timer, | 219 | .timer = &omap3_timer, |