summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/timer-gp.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-09-20 14:53:15 -0700
committerTony Lindgren <tony@atomide.com>2010-09-20 14:53:15 -0700
commitc3083411062106452649e464e55c7b856de0d29b (patch)
treef3cb9c0fddf091741d9e2e6bbaa7b17803c32970 /arch/arm/mach-omap2/timer-gp.c
parent49553c2ef88749dd502687f4eb9c258bb10a4f44 (diff)
downloadop-kernel-dev-c3083411062106452649e464e55c7b856de0d29b.zip
op-kernel-dev-c3083411062106452649e464e55c7b856de0d29b.tar.gz
omap: Fix CONFIG_LOCAL_TIMERS initialization for multi-omap
Fix CONFIG_LOCAL_TIMERS initialization for multi-omap Signed-off-by: Tony Lindgren <tony@atomide.com> Acked-By: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/timer-gp.c')
-rw-r--r--arch/arm/mach-omap2/timer-gp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 74fbed8..5a3e606 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -228,8 +228,10 @@ static void __init omap2_gp_clocksource_init(void)
static void __init omap2_gp_timer_init(void)
{
#ifdef CONFIG_LOCAL_TIMERS
- twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256);
- BUG_ON(!twd_base);
+ if (cpu_is_omap44xx()) {
+ twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256);
+ BUG_ON(!twd_base);
+ }
#endif
omap_dm_timer_init();
OpenPOWER on IntegriCloud