MIPS: Loongson1B: Fix reboot problem on LS1B

- Correct the header file of watchdog registers
 - Use ioremap_nocache() to access watchdog registers instead

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/8022/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 14 insertions, 6 deletions

diff --git a/arch/mips/loongson1/common/reset.c b/arch/mips/loongson1/common/reset.c
index 547f34b69e4c..c41e4ca56ab4 100644
--- a/arch/mips/loongson1/common/reset.c
+++ b/arch/mips/loongson1/common/reset.c
@@ -14,12 +14,7 @@
 
 #include <loongson1.h>
 
-static void ls1x_restart(char *command)
-{
-        __raw_writel(0x1, LS1X_WDT_EN);
-        __raw_writel(0x5000000, LS1X_WDT_TIMER);
-        __raw_writel(0x1, LS1X_WDT_SET);
-}
+static void __iomem *wdt_base;
 
 static void ls1x_halt(void)
 {
@@ -29,6 +24,15 @@ static void ls1x_halt(void)
         }
 }
 
+static void ls1x_restart(char *command)
+{
+        __raw_writel(0x1, wdt_base + WDT_EN);
+        __raw_writel(0x1, wdt_base + WDT_TIMER);
+        __raw_writel(0x1, wdt_base + WDT_SET);
+
+        ls1x_halt();
+}
+
 static void ls1x_power_off(void)
 {
         ls1x_halt();
@@ -36,6 +40,10 @@ static void ls1x_power_off(void)
 
 static int __init ls1x_reboot_setup(void)
 {
+        wdt_base = ioremap_nocache(LS1X_WDT_BASE, 0x0f);
+        if (!wdt_base)
+                panic("Failed to remap watchdog registers");
+
         _machine_restart = ls1x_restart;
         _machine_halt = ls1x_halt;
         pm_power_off = ls1x_power_off;