aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-09-20 17:53:15 -0400
committerTony Lindgren <tony@atomide.com>2010-09-20 17:53:15 -0400
commitc3083411062106452649e464e55c7b856de0d29b (patch)
treef3cb9c0fddf091741d9e2e6bbaa7b17803c32970
parent49553c2ef88749dd502687f4eb9c258bb10a4f44 (diff)
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>
-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 74fbed8491f..5a3e606dc44 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)
228static void __init omap2_gp_timer_init(void) 228static void __init omap2_gp_timer_init(void)
229{ 229{
230#ifdef CONFIG_LOCAL_TIMERS 230#ifdef CONFIG_LOCAL_TIMERS
231 twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256); 231 if (cpu_is_omap44xx()) {
232 BUG_ON(!twd_base); 232 twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256);
233 BUG_ON(!twd_base);
234 }
233#endif 235#endif
234 omap_dm_timer_init(); 236 omap_dm_timer_init();
235 237