summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-11-10 09:55:10 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:02:32 +0200
commit32a8f20d921762a5e72732c410c67cb3567b7ae7 (patch)
treef3080e3eab6d1626409301551e2fc8bbdcef7111
parent002265780178b5bf5471240c593f9ef5fbbc3ed7 (diff)
u5500: wait longer for reboot
Don't prematurely claim the reboot failed, since the firmware could take more than 2 seconds to trigger it. ST-Ericsson ID: 370028 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I556aac11909afcc13d4d6a20f7217571c4011774 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/37909 Reviewed-by: Vijaya Kumar K-1 <vijay.kilari@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/cpu.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index 617f2fe8a02..b7d0169c4f7 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -72,6 +72,14 @@ void ux500_restart(char mode, const char *cmd)
prcmu_system_reset(reset_code);
mdelay(1000);
+
+ /*
+ * On 5500, the PRCMU firmware waits for up to 2 seconds for the modem
+ * to respond.
+ */
+ if (cpu_is_u5500())
+ mdelay(2000);
+
printk(KERN_ERR "Reboot via PRCMU failed -- System halted\n");
while (1)
;