diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-14 16:50:48 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-14 16:50:48 -0700 |
| commit | 0d86331b4cc9b0c52d41bbe78cb4b75f40b7381c (patch) | |
| tree | 0915ba9339ed5f0b9a8e8dabbe9faca9e8510c84 | |
| parent | f54ffe0fef2b0bd635e2ee2738155fca70854675 (diff) | |
| parent | 807eba55f73e98b76d0afdc197d942c46122bdca (diff) | |
| download | linux-0d86331b4cc9b0c52d41bbe78cb4b75f40b7381c.tar.gz linux-0d86331b4cc9b0c52d41bbe78cb4b75f40b7381c.tar.bz2 linux-0d86331b4cc9b0c52d41bbe78cb4b75f40b7381c.zip | |
Merge tag 'ux500-clksrc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers
From Linus Walleij:
Ux500 clocksource updates:
- Use relaxed readl() variant
- Fix a single comment
* tag 'ux500-clksrc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
clocksource: dbx500-prcmu: comment cleanup
clocksource: dbx500-prcmu: use relaxed readl variant
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/clocksource/clksrc-dbx500-prcmu.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c index 54f3d119d99c..77398f8c19a0 100644 --- a/drivers/clocksource/clksrc-dbx500-prcmu.c +++ b/drivers/clocksource/clksrc-dbx500-prcmu.c @@ -10,7 +10,7 @@ * DBx500-PRCMU Timer * The PRCMU has 5 timers which are available in a always-on * power domain. We use the Timer 4 for our always-on clock - * source on DB8500 and Timer 3 on DB5500. + * source on DB8500. */ #include <linux/clockchips.h> #include <linux/clksrc-dbx500-prcmu.h> @@ -30,15 +30,14 @@ static void __iomem *clksrc_dbx500_timer_base; -static cycle_t clksrc_dbx500_prcmu_read(struct clocksource *cs) +static cycle_t notrace clksrc_dbx500_prcmu_read(struct clocksource *cs) { + void __iomem *base = clksrc_dbx500_timer_base; u32 count, count2; do { - count = readl(clksrc_dbx500_timer_base + - PRCMU_TIMER_DOWNCOUNT); - count2 = readl(clksrc_dbx500_timer_base + - PRCMU_TIMER_DOWNCOUNT); + count = readl_relaxed(base + PRCMU_TIMER_DOWNCOUNT); + count2 = readl_relaxed(base + PRCMU_TIMER_DOWNCOUNT); } while (count2 != count); /* Negate because the timer is a decrementing counter */ |