Commit d3930614 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Russell King

[ARM] 5014/1: Cleanup reset state before entering suspend or resetting.

The kernel should clean stale bits from reset status, so that
they won't confuse the bootloader.
Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 406b1ea4
...@@ -46,8 +46,8 @@ int pxa_pm_enter(suspend_state_t state) ...@@ -46,8 +46,8 @@ int pxa_pm_enter(suspend_state_t state)
sleep_save_checksum += sleep_save[i]; sleep_save_checksum += sleep_save[i];
} }
/* Clear sleep reset status */ /* Clear reset status */
RCSR = RCSR_SMR; RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
/* *** go zzz *** */ /* *** go zzz *** */
pxa_cpu_pm_fns->enter(state); pxa_cpu_pm_fns->enter(state);
......
...@@ -22,6 +22,8 @@ static inline void arch_idle(void) ...@@ -22,6 +22,8 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode) static inline void arch_reset(char mode)
{ {
RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
if (mode == 's') { if (mode == 's') {
/* Jump into ROM at address 0 */ /* Jump into ROM at address 0 */
cpu_reset(0); cpu_reset(0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment