[PATCH 3/8] soc: bcm: bcm2835-pm: Stop using _relaxed mmio accessors.

[Eric Anholt]

We definitely don't want I/O to be reordered here (like the setting of
the WDT timeout before enabling the WDT).  None of this is performance
critical, anyway.

Signed-off-by: Eric Anholt <e...@anholt.net>
---
 drivers/soc/bcm/bcm2835-pm.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/soc/bcm/bcm2835-pm.c b/drivers/soc/bcm/bcm2835-pm.c
index ca37145e4e40..decc316fbe40 100644
--- a/drivers/soc/bcm/bcm2835-pm.c
+++ b/drivers/soc/bcm/bcm2835-pm.c
@@ -67,11 +67,11 @@ static int bcm2835_wdt_start(struct watchdog_device *wdog)
 
        spin_lock_irqsave(&pm->lock, flags);
 
-       writel_relaxed(PM_PASSWORD | (SECS_TO_WDOG_TICKS(wdog->timeout) &
-                               PM_WDOG_TIME_SET), pm->base + PM_WDOG);
-       cur = readl_relaxed(pm->base + PM_RSTC);
-       writel_relaxed(PM_PASSWORD | (cur & PM_RSTC_WRCFG_CLR) |
-                 PM_RSTC_WRCFG_FULL_RESET, pm->base + PM_RSTC);
+       writel(PM_PASSWORD | (SECS_TO_WDOG_TICKS(wdog->timeout) &
+                             PM_WDOG_TIME_SET), pm->base + PM_WDOG);
+       cur = readl(pm->base + PM_RSTC);
+       writel(PM_PASSWORD | (cur & PM_RSTC_WRCFG_CLR) |
+              PM_RSTC_WRCFG_FULL_RESET, pm->base + PM_RSTC);
 
        spin_unlock_irqrestore(&pm->lock, flags);
 
@@ -82,7 +82,7 @@ static int bcm2835_wdt_stop(struct watchdog_device *wdog)
 {
        struct bcm2835_pm *pm = watchdog_get_drvdata(wdog);
 
-       writel_relaxed(PM_PASSWORD | PM_RSTC_RESET, pm->base + PM_RSTC);
+       writel(PM_PASSWORD | PM_RSTC_RESET, pm->base + PM_RSTC);
        return 0;
 }
 
@@ -90,7 +90,7 @@ static unsigned int bcm2835_wdt_get_timeleft(struct 
watchdog_device *wdog)
 {
        struct bcm2835_pm *pm = watchdog_get_drvdata(wdog);
 
-       uint32_t ret = readl_relaxed(pm->base + PM_WDOG);
+       uint32_t ret = readl(pm->base + PM_WDOG);
        return WDOG_TICKS_TO_SECS(ret & PM_WDOG_TIME_SET);
 }
 
@@ -99,11 +99,11 @@ static void __bcm2835_restart(struct bcm2835_pm *pm)
        u32 val;
 
        /* use a timeout of 10 ticks (~150us) */
-       writel_relaxed(10 | PM_PASSWORD, pm->base + PM_WDOG);
-       val = readl_relaxed(pm->base + PM_RSTC);
+       writel(10 | PM_PASSWORD, pm->base + PM_WDOG);
+       val = readl(pm->base + PM_RSTC);
        val &= PM_RSTC_WRCFG_CLR;
        val |= PM_PASSWORD | PM_RSTC_WRCFG_FULL_RESET;
-       writel_relaxed(val, pm->base + PM_RSTC);
+       writel(val, pm->base + PM_RSTC);
 
        /* No sleeping, possibly atomic. */
        mdelay(1);
@@ -159,9 +159,9 @@ static void bcm2835_power_off(void)
         * from the normal (full) reset. bootcode.bin will not reboot after a
         * hard reset.
         */
-       val = readl_relaxed(pm->base + PM_RSTS);
+       val = readl(pm->base + PM_RSTS);
        val |= PM_PASSWORD | PM_RSTS_RASPBERRYPI_HALT;
-       writel_relaxed(val, pm->base + PM_RSTS);
+       writel(val, pm->base + PM_RSTS);
 
        /* Continue with normal reset mechanism */
        __bcm2835_restart(pm);
-- 
2.19.1