From patchwork Mon Oct 1 10:03:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [16/19] Revert "UBUNTU: SAUCE: ARM: highbank: use writel_relaxed variant for pwr requests" Date: Mon, 01 Oct 2012 00:03:31 -0000 From: Ike Panhc X-Patchwork-Id: 188266 Message-Id: <1349085811-23656-1-git-send-email-ike.pan@canonical.com> To: kernel-team@lists.ubuntu.com From: Rob Herring BugLink: http://launchpad.net/bugs/1059432 This reverts commit 4dc55d275936de17c4d331300200c03697dab6a7. Signed-off-by: Ike Panhc --- 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