diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-06-26 20:27:06 -0500 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2012-08-15 23:46:26 -0600 |
commit | 498b5aed1c47156c8ee3e3f56c5b7812a56e17cd (patch) | |
tree | d37b20832a9096ab11a39f3fdcf110e56b15cca9 | |
parent | 84bb6fd0cac7f18db8ae8cd221f12c26a1d3ac2e (diff) | |
download | linux-topics-498b5aed1c47156c8ee3e3f56c5b7812a56e17cd.tar.gz |
UBUNTU: SAUCE: ARM: highbank: use writel_relaxed variant for pwr requests
BugLink: http://launchpad.net/bugs/1008345
At least for reset, the spinlock for l2x0 cache causes reboot to hang.
Convert writel to writel_relaxed for all writes to the PWR_REQ register.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Ike Panhc <ike.pan@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
-rw-r--r-- | arch/arm/mach-highbank/sysregs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-highbank/sysregs.h b/arch/arm/mach-highbank/sysregs.h index 0e913389f44..6b10548801e 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(HB_PWR_SUSPEND, sregs_base + HB_SREG_A9_PWR_REQ); + writel_relaxed(HB_PWR_SUSPEND, sregs_base + HB_SREG_A9_PWR_REQ); } static inline void hignbank_set_pwr_shutdown(void) { - writel(HB_PWR_SHUTDOWN, sregs_base + HB_SREG_A9_PWR_REQ); + writel_relaxed(HB_PWR_SHUTDOWN, sregs_base + HB_SREG_A9_PWR_REQ); } static inline void hignbank_set_pwr_soft_reset(void) { - writel(HB_PWR_SOFT_RESET, sregs_base + HB_SREG_A9_PWR_REQ); + writel_relaxed(HB_PWR_SOFT_RESET, sregs_base + HB_SREG_A9_PWR_REQ); } static inline void hignbank_set_pwr_hard_reset(void) { - writel(HB_PWR_HARD_RESET, sregs_base + HB_SREG_A9_PWR_REQ); + writel_relaxed(HB_PWR_HARD_RESET, sregs_base + HB_SREG_A9_PWR_REQ); } #endif |