Skip to content

Commit

Permalink
ARM: mmp: Switch to using timer 1 as clocksource timer.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lennert Buytenhek authored and Eric Miao committed Aug 11, 2011
1 parent 7ce5ae3 commit 71c0c34
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-mmp/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 71c0c34

Please sign in to comment.