Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-sunxi / sunxi.c

diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 8f42df8af1da5c6abe33dfdb8500ecc3dbe9810c..9be910f7920b9d464f49bcb0e40c08f9ddf8e5cb 100644 (file)
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -10,8 +10,10 @@
  * warranty of any kind, whether express or implied.
  */
 
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
@@ -26,6 +28,36 @@
 
 #include "sunxi.h"
 
+#define WATCHDOG_CTRL_REG      0x00
+#define WATCHDOG_MODE_REG      0x04
+
+static void __iomem *wdt_base;
+
+static void sunxi_setup_restart(void)
+{
+       struct device_node *np = of_find_compatible_node(NULL, NULL,
+                                               "allwinner,sunxi-wdt");
+       if (WARN(!np, "unable to setup watchdog restart"))
+               return;
+
+       wdt_base = of_iomap(np, 0);
+       WARN(!wdt_base, "failed to map watchdog base address");
+}
+
+static void sunxi_restart(char mode, const char *cmd)
+{
+       if (!wdt_base)
+               return;
+
+       /* Enable timer and set reset bit in the watchdog */
+       writel(3, wdt_base + WATCHDOG_MODE_REG);
+       writel(0xa57 << 1 | 1, wdt_base + WATCHDOG_CTRL_REG);
+       while(1) {
+               mdelay(5);
+               writel(3, wdt_base + WATCHDOG_MODE_REG);
+       }
+}
+
 static struct map_desc sunxi_io_desc[] __initdata = {
        {
                .virtual        = (unsigned long) SUNXI_REGS_VIRT_BASE,
@@ -42,10 +74,13 @@ void __init sunxi_map_io(void)
 
 static void __init sunxi_dt_init(void)
 {
+       sunxi_setup_restart();
+
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
 static const char * const sunxi_board_dt_compat[] = {
+       "allwinner,sun4i",
        "allwinner,sun5i",
        NULL,
 };
@@ -55,6 +90,7 @@ DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
        .map_io         = sunxi_map_io,
        .init_irq       = sunxi_init_irq,
        .handle_irq     = sunxi_handle_irq,
+       .restart        = sunxi_restart,
        .timer          = &sunxi_timer,
        .dt_compat      = sunxi_board_dt_compat,
 MACHINE_END