From: Lennert Buytenhek Date: Tue, 9 Aug 2011 18:37:34 +0000 (+0800) Subject: ARM: mmp: Switch to using timer 1 as clocksource timer. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=71c0c341403cb141e3580817947e56a4386db4c8;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git ARM: mmp: Switch to using timer 1 as clocksource timer. Signed-off-by: Lennert Buytenhek Acked-by: Haojian Zhuang Signed-off-by: Eric Miao --- diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c index 09e88c25fe8e..c53715edfa82 100644 --- a/arch/arm/mach-mmp/time.c +++ b/arch/arm/mach-mmp/time.c @@ -51,12 +51,12 @@ static inline uint32_t timer_read(void) { int delay = 100; - __raw_writel(1, TIMERS_VIRT_BASE + TMR_CVWR(0)); + __raw_writel(1, TIMERS_VIRT_BASE + TMR_CVWR(1)); while (delay--) cpu_relax(); - return __raw_readl(TIMERS_VIRT_BASE + TMR_CVWR(0)); + return __raw_readl(TIMERS_VIRT_BASE + TMR_CVWR(1)); } unsigned long long notrace sched_clock(void)