From f244c58671c551b20ad32053a1424af601c89d81 Mon Sep 17 00:00:00 2001 From: Lennert Buytenhek Date: Wed, 10 Aug 2011 02:37:34 +0800 Subject: [PATCH] --- yaml --- r: 262829 b: refs/heads/master c: 71c0c341403cb141e3580817947e56a4386db4c8 h: refs/heads/master i: 262827: d8c6425da5aa479302f8339b5c9a3d90a80c4358 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mmp/time.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 990f1eab506a..6efc50fcd745 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ce5ae39c46f159aee3b3427844f1491e1ccac74 +refs/heads/master: 71c0c341403cb141e3580817947e56a4386db4c8 diff --git a/trunk/arch/arm/mach-mmp/time.c b/trunk/arch/arm/mach-mmp/time.c index 09e88c25fe8e..c53715edfa82 100644 --- a/trunk/arch/arm/mach-mmp/time.c +++ b/trunk/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)