diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 3ae16b4e3f52..e085371eb494 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -447,13 +447,6 @@ static struct platform_device keys_gpio = { | |||
447 | static void __init omap3_beagle_init_early(void) | 447 | static void __init omap3_beagle_init_early(void) |
448 | { | 448 | { |
449 | omap2_init_common_infrastructure(); | 449 | omap2_init_common_infrastructure(); |
450 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, | ||
451 | mt46h32m32lf6_sdrc_params); | ||
452 | } | ||
453 | |||
454 | static void __init omap3_beagle_init_irq(void) | ||
455 | { | ||
456 | omap3_init_irq(); | ||
457 | } | 450 | } |
458 | 451 | ||
459 | static struct platform_device *omap3_beagle_devices[] __initdata = { | 452 | static struct platform_device *omap3_beagle_devices[] __initdata = { |
@@ -534,6 +527,8 @@ static void __init omap3_beagle_init(void) | |||
534 | ARRAY_SIZE(omap3_beagle_devices)); | 527 | ARRAY_SIZE(omap3_beagle_devices)); |
535 | omap_display_init(&beagle_dss_data); | 528 | omap_display_init(&beagle_dss_data); |
536 | omap_serial_init(); | 529 | omap_serial_init(); |
530 | omap_sdrc_init(mt46h32m32lf6_sdrc_params, | ||
531 | mt46h32m32lf6_sdrc_params); | ||
537 | 532 | ||
538 | omap_mux_init_gpio(170, OMAP_PIN_INPUT); | 533 | omap_mux_init_gpio(170, OMAP_PIN_INPUT); |
539 | /* REVISIT leave DVI powered down until it's needed ... */ | 534 | /* REVISIT leave DVI powered down until it's needed ... */ |
@@ -561,7 +556,7 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") | |||
561 | .reserve = omap_reserve, | 556 | .reserve = omap_reserve, |
562 | .map_io = omap3_map_io, | 557 | .map_io = omap3_map_io, |
563 | .init_early = omap3_beagle_init_early, | 558 | .init_early = omap3_beagle_init_early, |
564 | .init_irq = omap3_beagle_init_irq, | 559 | .init_irq = omap3_init_irq, |
565 | .init_machine = omap3_beagle_init, | 560 | .init_machine = omap3_beagle_init, |
566 | .timer = &omap3_secure_timer, | 561 | .timer = &omap3_secure_timer, |
567 | MACHINE_END | 562 | MACHINE_END |