projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
49553c2
)
omap: Fix CONFIG_LOCAL_TIMERS initialization for multi-omap
author
Tony Lindgren
<tony@atomide.com>
Mon, 20 Sep 2010 21:53:15 +0000
(14:53 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 20 Sep 2010 21:53:15 +0000
(14:53 -0700)
Fix CONFIG_LOCAL_TIMERS initialization for multi-omap
Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-By: Santosh Shilimkar <santosh.shilimkar@ti.com>
arch/arm/mach-omap2/timer-gp.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-omap2/timer-gp.c
b/arch/arm/mach-omap2/timer-gp.c
index
74fbed8
..
5a3e606
100644
(file)
--- 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();