1 files changed, 21 insertions, 21 deletions

diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
index 693fe486e917..37843a7d3639 100644
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
@@ -60,19 +60,19 @@ static unsigned int omap_secure_apis;
  */
 static inline u32 wakeupgen_readl(u8 idx, u32 cpu)
 {
-        return __raw_readl(wakeupgen_base + OMAP_WKG_ENB_A_0 +
+        return readl_relaxed(wakeupgen_base + OMAP_WKG_ENB_A_0 +
                                 (cpu * CPU_ENA_OFFSET) + (idx * 4));
 }
 
 static inline void wakeupgen_writel(u32 val, u8 idx, u32 cpu)
 {
-        __raw_writel(val, wakeupgen_base + OMAP_WKG_ENB_A_0 +
+        writel_relaxed(val, wakeupgen_base + OMAP_WKG_ENB_A_0 +
                                 (cpu * CPU_ENA_OFFSET) + (idx * 4));
 }
 
 static inline void sar_writel(u32 val, u32 offset, u8 idx)
 {
-        __raw_writel(val, sar_base + offset + (idx * 4));
+        writel_relaxed(val, sar_base + offset + (idx * 4));
 }
 
 static inline int _wakeupgen_get_irq_info(u32 irq, u32 *bit_posn, u8 *reg_index)
@@ -231,21 +231,21 @@ static inline void omap4_irq_save_context(void)
         }
 
         /* Save AuxBoot* registers */
-        val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
-        __raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET);
-        val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_1);
-        __raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);
+        val = readl_relaxed(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
+        writel_relaxed(val, sar_base + AUXCOREBOOT0_OFFSET);
+        val = readl_relaxed(wakeupgen_base + OMAP_AUX_CORE_BOOT_1);
+        writel_relaxed(val, sar_base + AUXCOREBOOT1_OFFSET);
 
         /* Save SyncReq generation logic */
-        val = __raw_readl(wakeupgen_base + OMAP_PTMSYNCREQ_MASK);
-        __raw_writel(val, sar_base + PTMSYNCREQ_MASK_OFFSET);
-        val = __raw_readl(wakeupgen_base + OMAP_PTMSYNCREQ_EN);
-        __raw_writel(val, sar_base + PTMSYNCREQ_EN_OFFSET);
+        val = readl_relaxed(wakeupgen_base + OMAP_PTMSYNCREQ_MASK);
+        writel_relaxed(val, sar_base + PTMSYNCREQ_MASK_OFFSET);
+        val = readl_relaxed(wakeupgen_base + OMAP_PTMSYNCREQ_EN);
+        writel_relaxed(val, sar_base + PTMSYNCREQ_EN_OFFSET);
 
         /* Set the Backup Bit Mask status */
-        val = __raw_readl(sar_base + SAR_BACKUP_STATUS_OFFSET);
+        val = readl_relaxed(sar_base + SAR_BACKUP_STATUS_OFFSET);
         val |= SAR_BACKUP_STATUS_WAKEUPGEN;
-        __raw_writel(val, sar_base + SAR_BACKUP_STATUS_OFFSET);
+        writel_relaxed(val, sar_base + SAR_BACKUP_STATUS_OFFSET);
 
 }
 
@@ -264,15 +264,15 @@ static inline void omap5_irq_save_context(void)
         }
 
         /* Save AuxBoot* registers */
-        val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
-        __raw_writel(val, sar_base + OMAP5_AUXCOREBOOT0_OFFSET);
-        val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
-        __raw_writel(val, sar_base + OMAP5_AUXCOREBOOT1_OFFSET);
+        val = readl_relaxed(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
+        writel_relaxed(val, sar_base + OMAP5_AUXCOREBOOT0_OFFSET);
+        val = readl_relaxed(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
+        writel_relaxed(val, sar_base + OMAP5_AUXCOREBOOT1_OFFSET);
 
         /* Set the Backup Bit Mask status */
-        val = __raw_readl(sar_base + OMAP5_SAR_BACKUP_STATUS_OFFSET);
+        val = readl_relaxed(sar_base + OMAP5_SAR_BACKUP_STATUS_OFFSET);
         val |= SAR_BACKUP_STATUS_WAKEUPGEN;
-        __raw_writel(val, sar_base + OMAP5_SAR_BACKUP_STATUS_OFFSET);
+        writel_relaxed(val, sar_base + OMAP5_SAR_BACKUP_STATUS_OFFSET);
 
 }
 
@@ -306,9 +306,9 @@ static void irq_sar_clear(void)
         if (soc_is_omap54xx())
                 offset = OMAP5_SAR_BACKUP_STATUS_OFFSET;
 
-        val = __raw_readl(sar_base + offset);
+        val = readl_relaxed(sar_base + offset);
         val &= ~SAR_BACKUP_STATUS_WAKEUPGEN;
-        __raw_writel(val, sar_base + offset);
+        writel_relaxed(val, sar_base + offset);
 }
 
 /*