aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/plat-omap/counter_32k.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c
index 384a776d8eb2..61b4d705c267 100644
--- a/arch/arm/plat-omap/counter_32k.c
+++ b/arch/arm/plat-omap/counter_32k.c
@@ -40,7 +40,7 @@ static void __iomem *sync32k_cnt_reg;
40 40
41static u64 notrace omap_32k_read_sched_clock(void) 41static u64 notrace omap_32k_read_sched_clock(void)
42{ 42{
43 return sync32k_cnt_reg ? __raw_readl(sync32k_cnt_reg) : 0; 43 return sync32k_cnt_reg ? readl_relaxed(sync32k_cnt_reg) : 0;
44} 44}
45 45
46/** 46/**
@@ -64,7 +64,7 @@ static void omap_read_persistent_clock(struct timespec *ts)
64 spin_lock_irqsave(&read_persistent_clock_lock, flags); 64 spin_lock_irqsave(&read_persistent_clock_lock, flags);
65 65
66 last_cycles = cycles; 66 last_cycles = cycles;
67 cycles = sync32k_cnt_reg ? __raw_readl(sync32k_cnt_reg) : 0; 67 cycles = sync32k_cnt_reg ? readl_relaxed(sync32k_cnt_reg) : 0;
68 68
69 nsecs = clocksource_cyc2ns(cycles - last_cycles, 69 nsecs = clocksource_cyc2ns(cycles - last_cycles,
70 persistent_mult, persistent_shift); 70 persistent_mult, persistent_shift);
@@ -95,7 +95,7 @@ int __init omap_init_clocksource_32k(void __iomem *vbase)
95 * The 'SCHEME' bits(30-31) of the revision register is used 95 * The 'SCHEME' bits(30-31) of the revision register is used
96 * to identify the version. 96 * to identify the version.
97 */ 97 */
98 if (__raw_readl(vbase + OMAP2_32KSYNCNT_REV_OFF) & 98 if (readl_relaxed(vbase + OMAP2_32KSYNCNT_REV_OFF) &
99 OMAP2_32KSYNCNT_REV_SCHEME) 99 OMAP2_32KSYNCNT_REV_SCHEME)
100 sync32k_cnt_reg = vbase + OMAP2_32KSYNCNT_CR_OFF_HIGH; 100 sync32k_cnt_reg = vbase + OMAP2_32KSYNCNT_CR_OFF_HIGH;
101 else 101 else