1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 869254cebf84..db10169a08de 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -103,7 +103,7 @@ static void omap_timer_restore_context(struct omap_dm_timer *timer)
                                 timer->context.tmar);
         omap_dm_timer_write_reg(timer, OMAP_TIMER_IF_CTRL_REG,
                                 timer->context.tsicr);
-        __raw_writel(timer->context.tier, timer->irq_ena);
+        writel_relaxed(timer->context.tier, timer->irq_ena);
         omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG,
                                 timer->context.tclr);
 }
@@ -699,9 +699,9 @@ int omap_dm_timer_set_int_disable(struct omap_dm_timer *timer, u32 mask)
         omap_dm_timer_enable(timer);
 
         if (timer->revision == 1)
-                l = __raw_readl(timer->irq_ena) & ~mask;
+                l = readl_relaxed(timer->irq_ena) & ~mask;
 
-        __raw_writel(l, timer->irq_dis);
+        writel_relaxed(l, timer->irq_dis);
         l = omap_dm_timer_read_reg(timer, OMAP_TIMER_WAKEUP_EN_REG) & ~mask;
         omap_dm_timer_write_reg(timer, OMAP_TIMER_WAKEUP_EN_REG, l);
 
@@ -722,7 +722,7 @@ unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)
                 return 0;
         }
 
-        l = __raw_readl(timer->irq_stat);
+        l = readl_relaxed(timer->irq_stat);
 
         return l;
 }