diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-apollon.c')
-rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 70211703ff9f..852843638fa9 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
@@ -273,12 +273,6 @@ static struct omap_board_config_kernel apollon_config[] __initdata = { | |||
273 | { OMAP_TAG_LCD, &apollon_lcd_config }, | 273 | { OMAP_TAG_LCD, &apollon_lcd_config }, |
274 | }; | 274 | }; |
275 | 275 | ||
276 | static void __init omap_apollon_init_early(void) | ||
277 | { | ||
278 | omap2_init_common_infrastructure(); | ||
279 | omap2_init_common_devices(NULL, NULL); | ||
280 | } | ||
281 | |||
282 | static struct gpio apollon_gpio_leds[] __initdata = { | 276 | static struct gpio apollon_gpio_leds[] __initdata = { |
283 | { LED0_GPIO13, GPIOF_OUT_INIT_LOW, "LED0" }, /* LED0 - AA10 */ | 277 | { LED0_GPIO13, GPIOF_OUT_INIT_LOW, "LED0" }, /* LED0 - AA10 */ |
284 | { LED1_GPIO14, GPIOF_OUT_INIT_LOW, "LED1" }, /* LED1 - AA6 */ | 278 | { LED1_GPIO14, GPIOF_OUT_INIT_LOW, "LED1" }, /* LED1 - AA6 */ |
@@ -340,20 +334,15 @@ static void __init omap_apollon_init(void) | |||
340 | */ | 334 | */ |
341 | platform_add_devices(apollon_devices, ARRAY_SIZE(apollon_devices)); | 335 | platform_add_devices(apollon_devices, ARRAY_SIZE(apollon_devices)); |
342 | omap_serial_init(); | 336 | omap_serial_init(); |
343 | } | 337 | omap_sdrc_init(NULL, NULL); |
344 | |||
345 | static void __init omap_apollon_map_io(void) | ||
346 | { | ||
347 | omap2_set_globals_242x(); | ||
348 | omap242x_map_common_io(); | ||
349 | } | 338 | } |
350 | 339 | ||
351 | MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon") | 340 | MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon") |
352 | /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */ | 341 | /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */ |
353 | .boot_params = 0x80000100, | 342 | .boot_params = 0x80000100, |
354 | .reserve = omap_reserve, | 343 | .reserve = omap_reserve, |
355 | .map_io = omap_apollon_map_io, | 344 | .map_io = omap242x_map_io, |
356 | .init_early = omap_apollon_init_early, | 345 | .init_early = omap2420_init_early, |
357 | .init_irq = omap2_init_irq, | 346 | .init_irq = omap2_init_irq, |
358 | .init_machine = omap_apollon_init, | 347 | .init_machine = omap_apollon_init, |
359 | .timer = &omap2_timer, | 348 | .timer = &omap2_timer, |