Revert "UBUNTU: SAUCE: ARM: highbank: use writel_relaxed variant for pwr requests"
 

From: Rob Herring <rob.herring@calxeda.com>

BugLink: http://launchpad.net/bugs/1059432

This reverts commit 4dc55d275936de17c4d331300200c03697dab6a7.

Signed-off-by: Ike Panhc <ike.pan@canonical.com>
---
arch/arm/mach-highbank/sysregs.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-highbank/sysregs.h b/arch/arm/mach-highbank/sysregs.h
index 6b10548..0e91338 100644
--- a/arch/arm/mach-highbank/sysregs.h
+++ b/arch/arm/mach-highbank/sysregs.h
@@ -31,22 +31,22 @@ extern void __iomem *sregs_base;

static inline void hignbank_set_pwr_suspend(void)
{
- writel_relaxed(HB_PWR_SUSPEND, sregs_base + HB_SREG_A9_PWR_REQ);
+ writel(HB_PWR_SUSPEND, sregs_base + HB_SREG_A9_PWR_REQ);
}

static inline void hignbank_set_pwr_shutdown(void)
{
- writel_relaxed(HB_PWR_SHUTDOWN, sregs_base + HB_SREG_A9_PWR_REQ);
+ writel(HB_PWR_SHUTDOWN, sregs_base + HB_SREG_A9_PWR_REQ);
}

static inline void hignbank_set_pwr_soft_reset(void)
{
- writel_relaxed(HB_PWR_SOFT_RESET, sregs_base + HB_SREG_A9_PWR_REQ);
+ writel(HB_PWR_SOFT_RESET, sregs_base + HB_SREG_A9_PWR_REQ);
}

static inline void hignbank_set_pwr_hard_reset(void)
{
- writel_relaxed(HB_PWR_HARD_RESET, sregs_base + HB_SREG_A9_PWR_REQ);
+ writel(HB_PWR_HARD_RESET, sregs_base + HB_SREG_A9_PWR_REQ);
}

#endif
--
1.7.9.5


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team