ARM: 8284/1: sa1100: clear RCSR_SMR on resume
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Thu, 15 Jan 2015 02:06:22 +0000 (03:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 29 Jan 2015 15:24:53 +0000 (15:24 +0000)
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 <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-sa1100/pm.c

index 6645d1e31f14d8c2ae089812a48a9c12d9c073e2..34853d5dfda28b9e5d5f79205c30c1a71facf5d8 100644 (file)
@@ -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;
 
        /*