1 files changed, 46 insertions, 28 deletions

diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 23afb732cb40..706ce35396b8 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -10,63 +10,77 @@
  * warranty of any kind, whether express or implied.
  */
 
+#include <linux/clocksource.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/irqchip.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
-#include <linux/sunxi_timer.h>
 
-#include <linux/irqchip/sunxi.h>
+#include <linux/clk/sunxi.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
+#include <asm/system_misc.h>
 
 #include "sunxi.h"
 
-#define WATCHDOG_CTRL_REG       0x00
-#define WATCHDOG_CTRL_RESTART           (1 << 0)
-#define WATCHDOG_MODE_REG       0x04
-#define WATCHDOG_MODE_ENABLE            (1 << 0)
-#define WATCHDOG_MODE_RESET_ENABLE      (1 << 1)
+#define SUN4I_WATCHDOG_CTRL_REG         0x00
+#define SUN4I_WATCHDOG_CTRL_RESTART             (1 << 0)
+#define SUN4I_WATCHDOG_MODE_REG         0x04
+#define SUN4I_WATCHDOG_MODE_ENABLE              (1 << 0)
+#define SUN4I_WATCHDOG_MODE_RESET_ENABLE        (1 << 1)
 
 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)
+static void sun4i_restart(char mode, const char *cmd)
 {
         if (!wdt_base)
                 return;
 
         /* Enable timer and set reset bit in the watchdog */
-        writel(WATCHDOG_MODE_ENABLE | WATCHDOG_MODE_RESET_ENABLE,
-                wdt_base + WATCHDOG_MODE_REG);
+        writel(SUN4I_WATCHDOG_MODE_ENABLE | SUN4I_WATCHDOG_MODE_RESET_ENABLE,
+               wdt_base + SUN4I_WATCHDOG_MODE_REG);
 
         /*
          * Restart the watchdog. The default (and lowest) interval
          * value for the watchdog is 0.5s.
          */
-        writel(WATCHDOG_CTRL_RESTART, wdt_base + WATCHDOG_CTRL_REG);
+        writel(SUN4I_WATCHDOG_CTRL_RESTART, wdt_base + SUN4I_WATCHDOG_CTRL_REG);
 
         while (1) {
                 mdelay(5);
-                writel(WATCHDOG_MODE_ENABLE | WATCHDOG_MODE_RESET_ENABLE,
-                        wdt_base + WATCHDOG_MODE_REG);
+                writel(SUN4I_WATCHDOG_MODE_ENABLE | SUN4I_WATCHDOG_MODE_RESET_ENABLE,
+                       wdt_base + SUN4I_WATCHDOG_MODE_REG);
         }
 }
 
+static struct of_device_id sunxi_restart_ids[] = {
+        { .compatible = "allwinner,sun4i-wdt", .data = sun4i_restart },
+        { /*sentinel*/ }
+};
+
+static void sunxi_setup_restart(void)
+{
+        const struct of_device_id *of_id;
+        struct device_node *np;
+
+        np = of_find_matching_node(NULL, sunxi_restart_ids);
+        if (WARN(!np, "unable to setup watchdog restart"))
+                return;
+
+        wdt_base = of_iomap(np, 0);
+        WARN(!wdt_base, "failed to map watchdog base address");
+
+        of_id = of_match_node(sunxi_restart_ids, np);
+        WARN(!of_id, "restart function not available");
+
+        arm_pm_restart = of_id->data;
+}
+
 static struct map_desc sunxi_io_desc[] __initdata = {
         {
                 .virtual        = (unsigned long) SUNXI_REGS_VIRT_BASE,
@@ -81,6 +95,12 @@ void __init sunxi_map_io(void)
         iotable_init(sunxi_io_desc, ARRAY_SIZE(sunxi_io_desc));
 }
 
+static void __init sunxi_timer_init(void)
+{
+        sunxi_init_clocks();
+        clocksource_of_init();
+}
+
 static void __init sunxi_dt_init(void)
 {
         sunxi_setup_restart();
@@ -97,9 +117,7 @@ static const char * const sunxi_board_dt_compat[] = {
 DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
         .init_machine   = sunxi_dt_init,
         .map_io         = sunxi_map_io,
-        .init_irq       = sunxi_init_irq,
-        .handle_irq     = sunxi_handle_irq,
-        .restart        = sunxi_restart,
-        .init_time      = &sunxi_timer_init,
+        .init_irq       = irqchip_init,
+        .init_time      = sunxi_timer_init,
         .dt_compat      = sunxi_board_dt_compat,
 MACHINE_END