Commit d3930614 authored Apr 21, 2008 by Dmitry Eremin-Solenikov Committed by Russell King Apr 24, 2008

[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>

parent 406b1ea4

arch/arm/mach-pxa/pm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

include/asm-arm/arch-pxa/system.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);