projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ce5ae3
)
ARM: mmp: Switch to using timer 1 as clocksource timer.
author
Lennert Buytenhek
<buytenh@wantstofly.org>
Tue, 9 Aug 2011 18:37:34 +0000
(
02:37
+0800)
committer
Eric Miao
<eric.y.miao@gmail.com>
Thu, 11 Aug 2011 02:10:45 +0000
(10:10 +0800)
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>
arch/arm/mach-mmp/time.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-mmp/time.c
b/arch/arm/mach-mmp/time.c
index 09e88c25fe8eb1ff9755a4fca3ca886d25f7ef52..c53715edfa825c5f428c94bcfecef208ee9c992b 100644
(file)
--- 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)