1 files changed, 49 insertions, 28 deletions

diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c
index 8b66bd87f0c1..22c55f73aa9d 100644
--- a/arch/mips/lantiq/xway/reset.c
+++ b/arch/mips/lantiq/xway/reset.c
@@ -11,26 +11,31 @@
 #include <linux/ioport.h>
 #include <linux/pm.h>
 #include <linux/export.h>
+#include <linux/delay.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+
 #include <asm/reboot.h>
 
 #include <lantiq_soc.h>
 
+#include "../prom.h"
+
 #define ltq_rcu_w32(x, y)       ltq_w32((x), ltq_rcu_membase + (y))
 #define ltq_rcu_r32(x)          ltq_r32(ltq_rcu_membase + (x))
 
-/* register definitions */
-#define LTQ_RCU_RST             0x0010
-#define LTQ_RCU_RST_ALL         0x40000000
-
-#define LTQ_RCU_RST_STAT        0x0014
-#define LTQ_RCU_STAT_SHIFT      26
+/* reset request register */
+#define RCU_RST_REQ             0x0010
+/* reset status register */
+#define RCU_RST_STAT            0x0014
 
-static struct resource ltq_rcu_resource = {
-        .name   = "rcu",
-        .start  = LTQ_RCU_BASE_ADDR,
-        .end    = LTQ_RCU_BASE_ADDR + LTQ_RCU_SIZE - 1,
-        .flags  = IORESOURCE_MEM,
-};
+/* reboot bit */
+#define RCU_RD_SRST             BIT(30)
+/* reset cause */
+#define RCU_STAT_SHIFT          26
+/* boot selection */
+#define RCU_BOOT_SEL_SHIFT      26
+#define RCU_BOOT_SEL_MASK       0x7
 
 /* remapped base addr of the reset control unit */
 static void __iomem *ltq_rcu_membase;
@@ -38,48 +43,64 @@ static void __iomem *ltq_rcu_membase;
 /* This function is used by the watchdog driver */
 int ltq_reset_cause(void)
 {
-        u32 val = ltq_rcu_r32(LTQ_RCU_RST_STAT);
-        return val >> LTQ_RCU_STAT_SHIFT;
+        u32 val = ltq_rcu_r32(RCU_RST_STAT);
+        return val >> RCU_STAT_SHIFT;
 }
 EXPORT_SYMBOL_GPL(ltq_reset_cause);
 
+/* allow platform code to find out what source we booted from */
+unsigned char ltq_boot_select(void)
+{
+        u32 val = ltq_rcu_r32(RCU_RST_STAT);
+        return (val >> RCU_BOOT_SEL_SHIFT) & RCU_BOOT_SEL_MASK;
+}
+
+/* reset a io domain for u micro seconds */
+void ltq_reset_once(unsigned int module, ulong u)
+{
+        ltq_rcu_w32(ltq_rcu_r32(RCU_RST_REQ) | module, RCU_RST_REQ);
+        udelay(u);
+        ltq_rcu_w32(ltq_rcu_r32(RCU_RST_REQ) & ~module, RCU_RST_REQ);
+}
+
 static void ltq_machine_restart(char *command)
 {
-        pr_notice("System restart\n");
         local_irq_disable();
-        ltq_rcu_w32(ltq_rcu_r32(LTQ_RCU_RST) | LTQ_RCU_RST_ALL, LTQ_RCU_RST);
+        ltq_rcu_w32(ltq_rcu_r32(RCU_RST_REQ) | RCU_RD_SRST, RCU_RST_REQ);
         unreachable();
 }
 
 static void ltq_machine_halt(void)
 {
-        pr_notice("System halted.\n");
         local_irq_disable();
         unreachable();
 }
 
 static void ltq_machine_power_off(void)
 {
-        pr_notice("Please turn off the power now.\n");
         local_irq_disable();
         unreachable();
 }
 
 static int __init mips_reboot_setup(void)
 {
-        /* insert and request the memory region */
-        if (insert_resource(&iomem_resource, &ltq_rcu_resource) < 0)
-                panic("Failed to insert rcu memory");
+        struct resource res;
+        struct device_node *np =
+                of_find_compatible_node(NULL, NULL, "lantiq,rcu-xway");
+
+        /* check if all the reset register range is available */
+        if (!np)
+                panic("Failed to load reset resources from devicetree");
+
+        if (of_address_to_resource(np, 0, &res))
+                panic("Failed to get rcu memory range");
 
-        if (request_mem_region(ltq_rcu_resource.start,
-                        resource_size(&ltq_rcu_resource), "rcu") < 0)
-                panic("Failed to request rcu memory");
+        if (request_mem_region(res.start, resource_size(&res), res.name) < 0)
+                pr_err("Failed to request rcu memory");
 
-        /* remap rcu register range */
-        ltq_rcu_membase = ioremap_nocache(ltq_rcu_resource.start,
-                                resource_size(&ltq_rcu_resource));
+        ltq_rcu_membase = ioremap_nocache(res.start, resource_size(&res));
         if (!ltq_rcu_membase)
-                panic("Failed to remap rcu memory");
+                panic("Failed to remap core memory");
 
         _machine_restart = ltq_machine_restart;
         _machine_halt = ltq_machine_halt;