diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-12-30 17:15:06 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-08 06:08:25 +0100 |
| commit | 9852910a0b0aa5548f990b51ad335921e0a710bf (patch) | |
| tree | a440d465931017c0d0e3c6a9ac8f14fecae87457 /arch/arm/mach-highbank | |
| parent | ARM: highbank: fix secondary boot and hotplug (diff) | |
| download | linux-9852910a0b0aa5548f990b51ad335921e0a710bf.tar.xz linux-9852910a0b0aa5548f990b51ad335921e0a710bf.zip | |
ARM: highbank: add a power request clear
When we fail to power down, we need to clear out the power request.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-highbank')
| -rw-r--r-- | arch/arm/mach-highbank/sysregs.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-highbank/sysregs.h b/arch/arm/mach-highbank/sysregs.h index 707cfd3d80ec..70af9d13fcef 100644 --- a/arch/arm/mach-highbank/sysregs.h +++ b/arch/arm/mach-highbank/sysregs.h @@ -44,6 +44,15 @@ static inline void highbank_set_core_pwr(void) writel_relaxed(1, sregs_base + SREG_CPU_PWR_CTRL(cpu)); } +static inline void highbank_clear_core_pwr(void) +{ + int cpu = cpu_logical_map(smp_processor_id()); + if (scu_base_addr) + scu_power_mode(scu_base_addr, SCU_PM_NORMAL); + else + writel_relaxed(0, sregs_base + SREG_CPU_PWR_CTRL(cpu)); +} + static inline void highbank_set_pwr_suspend(void) { writel(HB_PWR_SUSPEND, sregs_base + HB_SREG_A9_PWR_REQ); @@ -68,4 +77,10 @@ static inline void highbank_set_pwr_hard_reset(void) highbank_set_core_pwr(); } +static inline void highbank_clear_pwr_request(void) +{ + writel(~0UL, sregs_base + HB_SREG_A9_PWR_REQ); + highbank_clear_core_pwr(); +} + #endif |