From: Dmitry Eremin-Solenikov Date: Thu, 15 Jan 2015 02:06:22 +0000 (+0100) Subject: ARM: 8284/1: sa1100: clear RCSR_SMR on resume X-Git-Tag: firefly_0821_release~176^2~2346^2~1^5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e461894dc2ce7778ccde1c3483c9b15a85a7fc5f;p=firefly-linux-kernel-4.4.55.git ARM: 8284/1: sa1100: clear RCSR_SMR on resume StrongARM core uses RCSR SMR bit to tell to bootloader that it was reset by entering the sleep mode. After we have resumed, there is little point in having that bit enabled. Moreover, if this bit is set before reboot, the bootloader can become confused. Thus clear the SMR bit on resume just before clearing the scratchpad (resume address) register. Cc: stable@vger.kernel.org Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Russell King --- diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c index 6645d1e31f14..34853d5dfda2 100644 --- a/arch/arm/mach-sa1100/pm.c +++ b/arch/arm/mach-sa1100/pm.c @@ -81,6 +81,7 @@ static int sa11x0_pm_enter(suspend_state_t state) /* * Ensure not to come back here if it wasn't intended */ + RCSR = RCSR_SMR; PSPR = 0; /*