aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3touchbook.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3touchbook.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3touchbook.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index 852ea0464057..f7f18092f36d 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -326,13 +326,6 @@ static struct omap_board_mux board_mux[] __initdata = {
326}; 326};
327#endif 327#endif
328 328
329static 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
336static void __init omap3_touchbook_init_irq(void) 329static void __init omap3_touchbook_init_irq(void)
337{ 330{
338 omap3_init_irq(); 331 omap3_init_irq();
@@ -385,6 +378,8 @@ static void __init omap3_touchbook_init(void)
385 platform_add_devices(omap3_touchbook_devices, 378 platform_add_devices(omap3_touchbook_devices,
386 ARRAY_SIZE(omap3_touchbook_devices)); 379 ARRAY_SIZE(omap3_touchbook_devices));
387 omap_serial_init(); 380 omap_serial_init();
381 omap_sdrc_init(mt46h32m32lf6_sdrc_params,
382 mt46h32m32lf6_sdrc_params);
388 383
389 omap_mux_init_gpio(170, OMAP_PIN_INPUT); 384 omap_mux_init_gpio(170, OMAP_PIN_INPUT);
390 /* REVISIT leave DVI powered down until it's needed ... */ 385 /* REVISIT leave DVI powered down until it's needed ... */
@@ -407,7 +402,7 @@ MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board")
407 .boot_params = 0x80000100, 402 .boot_params = 0x80000100,
408 .reserve = omap_reserve, 403 .reserve = omap_reserve,
409 .map_io = omap3_map_io, 404 .map_io = omap3_map_io,
410 .init_early = omap3_touchbook_init_early, 405 .init_early = omap3430_init_early,
411 .init_irq = omap3_touchbook_init_irq, 406 .init_irq = omap3_touchbook_init_irq,
412 .init_machine = omap3_touchbook_init, 407 .init_machine = omap3_touchbook_init,
413 .timer = &omap3_secure_timer, 408 .timer = &omap3_secure_timer,