aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2015-01-15 03:06:22 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-06 14:43:28 -0800
commit3a496d674d48c997937ea1313ea4572f63c03f69 (patch)
tree0981c117fac9a759ca60244cd4f1af839cf7d589
parentf77fc6971c4fb1a656cb19d913a1eb2c393dfc92 (diff)
downloadlinux-yocto-3a496d674d48c997937ea1313ea4572f63c03f69.tar.gz
linux-yocto-3a496d674d48c997937ea1313ea4572f63c03f69.tar.bz2
linux-yocto-3a496d674d48c997937ea1313ea4572f63c03f69.zip
ARM: 8284/1: sa1100: clear RCSR_SMR on resume
commit e461894dc2ce7778ccde1c3483c9b15a85a7fc5f upstream. 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. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/mach-sa1100/pm.c1
1 files changed, 1 insertions, 0 deletions
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;
/*