ARM: 5873/1: ARM: Fix the reset logic for ARM RealView boards

Extend the patch from Philby John to the other "RealView" boards.
Rename the constants and offsets to reflect their actual functions.

Cc: Philby John <pjohn@in.mvista.com>
Signed-off-by: Colin Tuckley <colin.tuckley@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 15 insertions, 0 deletions

diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index fe861e96c566..fe4e25c4201a 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -272,6 +272,20 @@ static struct sys_timer realview_pba8_timer = {
         .init           = realview_pba8_timer_init,
 };
 
+static void realview_pba8_reset(char mode)
+{
+        void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL);
+        void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK);
+
+        /*
+         * To reset, we hit the on-board reset register
+         * in the system FPGA
+         */
+        __raw_writel(REALVIEW_SYS_LOCK_VAL, lock_ctrl);
+        __raw_writel(0x0000, reset_ctrl);
+        __raw_writel(0x0004, reset_ctrl);
+}
+
 static void __init realview_pba8_init(void)
 {
         int i;
@@ -291,6 +305,7 @@ static void __init realview_pba8_init(void)
 #ifdef CONFIG_LEDS
         leds_event = realview_leds_event;
 #endif
+        realview_reset = realview_pba8_reset;
 }
 
 MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8")