From: Shiraz Hashim <shiraz.hashim@st.com>
Date: Wed, 16 Feb 2011 06:40:29 +0000 (+0100)
Subject: ARM: 6722/1: SPEAr: sp810: switch to slow mode before reset
X-Git-Tag: v2.6.38-rc6~13^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b8272a61c16decd4c8627fc1181bdd174c922c3f;p=karo-tx-linux.git

ARM: 6722/1: SPEAr: sp810: switch to slow mode before reset

In sysctl_soft_reset(), switch to slow mode before resetting the system
via the system controller.  This is required.

Reviewed-by: Stanley Miao <stanley.miao@windriver.com>
Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/include/asm/hardware/sp810.h b/arch/arm/include/asm/hardware/sp810.h
index 721847dc68ab..e0d1c0cfa548 100644
--- a/arch/arm/include/asm/hardware/sp810.h
+++ b/arch/arm/include/asm/hardware/sp810.h
@@ -58,6 +58,9 @@
 
 static inline void sysctl_soft_reset(void __iomem *base)
 {
+	/* switch to slow mode */
+	writel(0x2, base + SCCTRL);
+
 	/* writing any value to SCSYSSTAT reg will reset system */
 	writel(0, base + SCSYSSTAT);
 }