diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3logic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3logic.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index 703aeb5b8fd4..3a1dd84faca0 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c | |||
@@ -182,12 +182,6 @@ static inline void __init board_smsc911x_init(void) | |||
182 | gpmc_smsc911x_init(&board_smsc911x_data); | 182 | gpmc_smsc911x_init(&board_smsc911x_data); |
183 | } | 183 | } |
184 | 184 | ||
185 | static void __init omap3logic_init_early(void) | ||
186 | { | ||
187 | omap2_init_common_infrastructure(); | ||
188 | omap2_init_common_devices(NULL, NULL); | ||
189 | } | ||
190 | |||
191 | #ifdef CONFIG_OMAP_MUX | 185 | #ifdef CONFIG_OMAP_MUX |
192 | static struct omap_board_mux board_mux[] __initdata = { | 186 | static struct omap_board_mux board_mux[] __initdata = { |
193 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 187 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
@@ -200,6 +194,7 @@ static void __init omap3logic_init(void) | |||
200 | omap3torpedo_fix_pbias_voltage(); | 194 | omap3torpedo_fix_pbias_voltage(); |
201 | omap3logic_i2c_init(); | 195 | omap3logic_i2c_init(); |
202 | omap_serial_init(); | 196 | omap_serial_init(); |
197 | omap_sdrc_init(NULL, NULL); | ||
203 | board_mmc_init(); | 198 | board_mmc_init(); |
204 | board_smsc911x_init(); | 199 | board_smsc911x_init(); |
205 | 200 | ||
@@ -211,7 +206,7 @@ static void __init omap3logic_init(void) | |||
211 | MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board") | 206 | MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board") |
212 | .boot_params = 0x80000100, | 207 | .boot_params = 0x80000100, |
213 | .map_io = omap3_map_io, | 208 | .map_io = omap3_map_io, |
214 | .init_early = omap3logic_init_early, | 209 | .init_early = omap35xx_init_early, |
215 | .init_irq = omap3_init_irq, | 210 | .init_irq = omap3_init_irq, |
216 | .init_machine = omap3logic_init, | 211 | .init_machine = omap3logic_init, |
217 | .timer = &omap3_timer, | 212 | .timer = &omap3_timer, |
@@ -220,7 +215,7 @@ MACHINE_END | |||
220 | MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board") | 215 | MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board") |
221 | .boot_params = 0x80000100, | 216 | .boot_params = 0x80000100, |
222 | .map_io = omap3_map_io, | 217 | .map_io = omap3_map_io, |
223 | .init_early = omap3logic_init_early, | 218 | .init_early = omap35xx_init_early, |
224 | .init_irq = omap3_init_irq, | 219 | .init_irq = omap3_init_irq, |
225 | .init_machine = omap3logic_init, | 220 | .init_machine = omap3logic_init, |
226 | .timer = &omap3_timer, | 221 | .timer = &omap3_timer, |