diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2011-08-09 14:37:34 -0400 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2011-08-10 22:10:45 -0400 |
| commit | 71c0c341403cb141e3580817947e56a4386db4c8 (patch) | |
| tree | 058a93117431c29d90a4c3f6a04cfc502e45afd8 /arch | |
| parent | 7ce5ae39c46f159aee3b3427844f1491e1ccac74 (diff) | |
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.c | 4 |
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) | |||
| 51 | { | 51 | { |
| 52 | int delay = 100; | 52 | int delay = 100; |
| 53 | 53 | ||
| 54 | __raw_writel(1, TIMERS_VIRT_BASE + TMR_CVWR(0)); | 54 | __raw_writel(1, TIMERS_VIRT_BASE + TMR_CVWR(1)); |
| 55 | 55 | ||
| 56 | while (delay--) | 56 | while (delay--) |
| 57 | cpu_relax(); | 57 | cpu_relax(); |
| 58 | 58 | ||
| 59 | return __raw_readl(TIMERS_VIRT_BASE + TMR_CVWR(0)); | 59 | return __raw_readl(TIMERS_VIRT_BASE + TMR_CVWR(1)); |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | unsigned long long notrace sched_clock(void) | 62 | unsigned long long notrace sched_clock(void) |