|
@@ -40,7 +40,7 @@ static void __iomem *sync32k_cnt_reg;
|
|
|
|
|
|
static u64 notrace omap_32k_read_sched_clock(void)
|
|
|
{
|
|
|
- return sync32k_cnt_reg ? __raw_readl(sync32k_cnt_reg) : 0;
|
|
|
+ return sync32k_cnt_reg ? readl_relaxed(sync32k_cnt_reg) : 0;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -64,7 +64,7 @@ static void omap_read_persistent_clock(struct timespec *ts)
|
|
|
spin_lock_irqsave(&read_persistent_clock_lock, flags);
|
|
|
|
|
|
last_cycles = cycles;
|
|
|
- cycles = sync32k_cnt_reg ? __raw_readl(sync32k_cnt_reg) : 0;
|
|
|
+ cycles = sync32k_cnt_reg ? readl_relaxed(sync32k_cnt_reg) : 0;
|
|
|
|
|
|
nsecs = clocksource_cyc2ns(cycles - last_cycles,
|
|
|
persistent_mult, persistent_shift);
|
|
@@ -95,7 +95,7 @@ int __init omap_init_clocksource_32k(void __iomem *vbase)
|
|
|
* The 'SCHEME' bits(30-31) of the revision register is used
|
|
|
* to identify the version.
|
|
|
*/
|
|
|
- if (__raw_readl(vbase + OMAP2_32KSYNCNT_REV_OFF) &
|
|
|
+ if (readl_relaxed(vbase + OMAP2_32KSYNCNT_REV_OFF) &
|
|
|
OMAP2_32KSYNCNT_REV_SCHEME)
|
|
|
sync32k_cnt_reg = vbase + OMAP2_32KSYNCNT_CR_OFF_HIGH;
|
|
|
else
|