summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-03-29 15:54:49 -0700
committerTony Lindgren <tony@atomide.com>2011-06-27 12:14:01 -0700
commit3d05a3e80c44cb792fc8194fd9abdb431dea5420 (patch)
treedea5877bafc74d67cc41b8cad6bd7de532bab4a4 /arch/arm/plat-omap
parent11a0186f3ef6aa6a9b8b81f5a501b6063fa47500 (diff)
downloadop-kernel-dev-3d05a3e80c44cb792fc8194fd9abdb431dea5420.zip
op-kernel-dev-3d05a3e80c44cb792fc8194fd9abdb431dea5420.tar.gz
omap2+: Use dmtimer macros for clocksource
Use dmtimer macros for clocksource. As with the clockevent, this allows us to initialize the rest of dmtimer code later on. Note that eventually we will be initializing the timesource from init_early so sched_clock will work properly for CONFIG_PRINTK_TIME. Signed-off-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/counter_32k.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c
index f7fed60..c13bc3d 100644
--- a/arch/arm/plat-omap/counter_32k.c
+++ b/arch/arm/plat-omap/counter_32k.c
@@ -126,7 +126,7 @@ static inline unsigned long long notrace _omap_32k_sched_clock(void)
return cyc_to_fixed_sched_clock(&cd, cyc, (u32)~0, SC_MULT, SC_SHIFT);
}
-#ifndef CONFIG_OMAP_MPU_TIMER
+#if defined(CONFIG_OMAP_32K_TIMER) && !defined(CONFIG_OMAP_MPU_TIMER)
unsigned long long notrace sched_clock(void)
{
return _omap_32k_sched_clock();
OpenPOWER on IntegriCloud