Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / clocksource / clksrc-dbx500-prcmu.c

diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c
index 0a7fb2440e2909490769a3613d2878411f420068..a9fd4ad2567426228c34a5910bf457a6a4bb584a 100644 (file)
--- 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>
@@ -29,15 +29,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 */