diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-04-21 11:54:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-24 14:34:26 +0100 |
| commit | d3930614e68bdf83a120d904c039a64e9f75dba1 (patch) | |
| tree | c220f2237893ddd72d9cee9b30d8b78171992f00 | |
| parent | 406b1ea441cb86671c5b57d2ce722d217914d524 (diff) | |
| download | kernel-crypto-d3930614e68bdf83a120d904c039a64e9f75dba1.tar.gz kernel-crypto-d3930614e68bdf83a120d904c039a64e9f75dba1.tar.xz kernel-crypto-d3930614e68bdf83a120d904c039a64e9f75dba1.zip | |
[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: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-pxa/pm.c | 4 | ||||
| -rw-r--r-- | include/asm-arm/arch-pxa/system.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index 039194cbe47..ec1bbf333a3 100644 --- a/arch/arm/mach-pxa/pm.c +++ b/arch/arm/mach-pxa/pm.c @@ -46,8 +46,8 @@ int pxa_pm_enter(suspend_state_t state) sleep_save_checksum += sleep_save[i]; } - /* Clear sleep reset status */ - RCSR = RCSR_SMR; + /* Clear reset status */ + RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR; /* *** go zzz *** */ pxa_cpu_pm_fns->enter(state); diff --git a/include/asm-arm/arch-pxa/system.h b/include/asm-arm/arch-pxa/system.h index 1d56a3ef89f..a758a719180 100644 --- a/include/asm-arm/arch-pxa/system.h +++ b/include/asm-arm/arch-pxa/system.h @@ -22,6 +22,8 @@ static inline void arch_idle(void) static inline void arch_reset(char mode) { + RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR; + if (mode == 's') { /* Jump into ROM at address 0 */ cpu_reset(0); |