From 7312f358567df22948166bc44851d2952698030a Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 27 Nov 2012 10:53:23 -0600 Subject: [PATCH 19/51] ARM: OMAP2: PWM: limit am33xx_register_ehrpwm to soc_is_am33xx, fixes boot on Beagle/Panda Signed-off-by: Robert Nelson --- arch/arm/mach-omap2/devices.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index d93689a..fab2153 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -551,8 +551,9 @@ static int __init omap2_init_devices(void) } omap_init_sti(); omap_init_vout(); - - am33xx_register_ehrpwm(); + if (soc_is_am33xx()) { + am33xx_register_ehrpwm(); + } return 0; } omap_arch_initcall(omap2_init_devices); -- 1.7.10.4