diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3touchbook.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3touchbook.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 852ea0464057..05488fbc20d5 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c | |||
@@ -326,18 +326,6 @@ static struct omap_board_mux board_mux[] __initdata = { | |||
326 | }; | 326 | }; |
327 | #endif | 327 | #endif |
328 | 328 | ||
329 | static void __init omap3_touchbook_init_early(void) | ||
330 | { | ||
331 | omap2_init_common_infrastructure(); | ||
332 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, | ||
333 | mt46h32m32lf6_sdrc_params); | ||
334 | } | ||
335 | |||
336 | static void __init omap3_touchbook_init_irq(void) | ||
337 | { | ||
338 | omap3_init_irq(); | ||
339 | } | ||
340 | |||
341 | static struct platform_device *omap3_touchbook_devices[] __initdata = { | 329 | static struct platform_device *omap3_touchbook_devices[] __initdata = { |
342 | &omap3_touchbook_lcd_device, | 330 | &omap3_touchbook_lcd_device, |
343 | &leds_gpio, | 331 | &leds_gpio, |
@@ -385,6 +373,8 @@ static void __init omap3_touchbook_init(void) | |||
385 | platform_add_devices(omap3_touchbook_devices, | 373 | platform_add_devices(omap3_touchbook_devices, |
386 | ARRAY_SIZE(omap3_touchbook_devices)); | 374 | ARRAY_SIZE(omap3_touchbook_devices)); |
387 | omap_serial_init(); | 375 | omap_serial_init(); |
376 | omap_sdrc_init(mt46h32m32lf6_sdrc_params, | ||
377 | mt46h32m32lf6_sdrc_params); | ||
388 | 378 | ||
389 | omap_mux_init_gpio(170, OMAP_PIN_INPUT); | 379 | omap_mux_init_gpio(170, OMAP_PIN_INPUT); |
390 | /* REVISIT leave DVI powered down until it's needed ... */ | 380 | /* REVISIT leave DVI powered down until it's needed ... */ |
@@ -407,8 +397,8 @@ MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board") | |||
407 | .boot_params = 0x80000100, | 397 | .boot_params = 0x80000100, |
408 | .reserve = omap_reserve, | 398 | .reserve = omap_reserve, |
409 | .map_io = omap3_map_io, | 399 | .map_io = omap3_map_io, |
410 | .init_early = omap3_touchbook_init_early, | 400 | .init_early = omap3430_init_early, |
411 | .init_irq = omap3_touchbook_init_irq, | 401 | .init_irq = omap3_init_irq, |
412 | .init_machine = omap3_touchbook_init, | 402 | .init_machine = omap3_touchbook_init, |
413 | .timer = &omap3_secure_timer, | 403 | .timer = &omap3_secure_timer, |
414 | MACHINE_END | 404 | MACHINE_END |