summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring2012-10-26 05:20:37 +0200
committerOlof Johansson2012-11-06 15:54:36 +0100
commite32643544d8d9e7776daf0a4e803c57b54ba77f0 (patch)
treef3976752ee950575f0c28426eb1e111c282f87ed
parentMerge branch 'upload/fix' of git://github.com/hzhuang1/linux into fixes (diff)
downloadkernel-qcow2-linux-e32643544d8d9e7776daf0a4e803c57b54ba77f0.tar.gz
kernel-qcow2-linux-e32643544d8d9e7776daf0a4e803c57b54ba77f0.tar.xz
kernel-qcow2-linux-e32643544d8d9e7776daf0a4e803c57b54ba77f0.zip
ARM: highbank: retry wfi on reset request
In some cases, an interrupt can occur and prevent cause failure to enter wfi. This causes reset to hang. Retrying the wfi should be enough to prevent reset from hanging. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-highbank/system.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-highbank/system.c b/arch/arm/mach-highbank/system.c
index 82c27230d4a9..86e37cd9376c 100644
--- a/arch/arm/mach-highbank/system.c
+++ b/arch/arm/mach-highbank/system.c
@@ -28,6 +28,7 @@ void highbank_restart(char mode, const char *cmd)
hignbank_set_pwr_soft_reset();
scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
- cpu_do_idle();
+ while (1)
+ cpu_do_idle();
}