From 5ed46412d0191786a0946369107b7c7d8a50a429 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 21 Jun 2010 13:22:08 +1000
Subject: [PATCH] --- yaml --- r: 201519 b: refs/heads/master c:
 445f12dca8f06113caa775315bff574dee72b27d h: refs/heads/master i:   201517:
 afeccebf7ab94015b108c7188762942591190278   201515:
 ada31510abbc031b696b69e225e598d30d6eb4b8   201511:
 856e03ad0a05d96c6469f979be6a4274e77a4159   201503:
 4eb3dad029be014e8504a38c36be0c5a88c867c4 v: v3

---
 [refs]                                            | 2 +-
 trunk/arch/arm/mach-orion5x/include/mach/system.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bedbfa7ef09f..fb5572b81284 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e2daa49420777190c133d7097dd8d5c05b475ac
+refs/heads/master: 445f12dca8f06113caa775315bff574dee72b27d
diff --git a/trunk/arch/arm/mach-orion5x/include/mach/system.h b/trunk/arch/arm/mach-orion5x/include/mach/system.h
index 60e734c10458..a1d6e46ab035 100644
--- a/trunk/arch/arm/mach-orion5x/include/mach/system.h
+++ b/trunk/arch/arm/mach-orion5x/include/mach/system.h
@@ -25,6 +25,8 @@ static inline void arch_reset(char mode, const char *cmd)
 	 */
 	orion5x_setbits(RSTOUTn_MASK, (1 << 2));
 	orion5x_setbits(CPU_SOFT_RESET, 1);
+	mdelay(200);
+	orion5x_clrbits(CPU_SOFT_RESET, 1);
 }