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 474a7e2cb638..70261bcda3f9 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -444,11 +444,6 @@ static struct platform_device keys_gpio = { | |||
444 | }, | 444 | }, |
445 | }; | 445 | }; |
446 | 446 | ||
447 | static void __init omap3_beagle_init_early(void) | ||
448 | { | ||
449 | omap2_init_common_infrastructure(); | ||
450 | } | ||
451 | |||
452 | static struct platform_device *omap3_beagle_devices[] __initdata = { | 447 | static struct platform_device *omap3_beagle_devices[] __initdata = { |
453 | &leds_gpio, | 448 | &leds_gpio, |
454 | &keys_gpio, | 449 | &keys_gpio, |
@@ -486,8 +481,8 @@ static void __init beagle_opp_init(void) | |||
486 | if (cpu_is_omap3630()) { | 481 | if (cpu_is_omap3630()) { |
487 | struct device *mpu_dev, *iva_dev; | 482 | struct device *mpu_dev, *iva_dev; |
488 | 483 | ||
489 | mpu_dev = omap2_get_mpuss_device(); | 484 | mpu_dev = omap_device_get_by_hwmod_name("mpu"); |
490 | iva_dev = omap2_get_iva_device(); | 485 | iva_dev = omap_device_get_by_hwmod_name("iva"); |
491 | 486 | ||
492 | if (!mpu_dev || !iva_dev) { | 487 | if (!mpu_dev || !iva_dev) { |
493 | pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n", | 488 | pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n", |
@@ -555,7 +550,7 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") | |||
555 | .atag_offset = 0x100, | 550 | .atag_offset = 0x100, |
556 | .reserve = omap_reserve, | 551 | .reserve = omap_reserve, |
557 | .map_io = omap3_map_io, | 552 | .map_io = omap3_map_io, |
558 | .init_early = omap3_beagle_init_early, | 553 | .init_early = omap3_init_early, |
559 | .init_irq = omap3_init_irq, | 554 | .init_irq = omap3_init_irq, |
560 | .init_machine = omap3_beagle_init, | 555 | .init_machine = omap3_beagle_init, |
561 | .timer = &omap3_secure_timer, | 556 | .timer = &omap3_secure_timer, |