summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2011-08-10 02:37:34 +0800
committerEric Miao <eric.y.miao@gmail.com>2011-08-11 10:10:45 +0800
commit71c0c341403cb141e3580817947e56a4386db4c8 (patch)
tree058a93117431c29d90a4c3f6a04cfc502e45afd8 /arch
parent7ce5ae39c46f159aee3b3427844f1491e1ccac74 (diff)
downloadlinux-71c0c341403cb141e3580817947e56a4386db4c8.tar.gz
linux-71c0c341403cb141e3580817947e56a4386db4c8.tar.bz2
linux-71c0c341403cb141e3580817947e56a4386db4c8.zip
ARM: mmp: Switch to using timer 1 as clocksource timer.
Signed-off-by: Lennert Buytenhek <buytenh@laptop.org> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mmp/time.c4
1 files changed, 2 insertions, 2 deletions
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)