1 files changed, 36 insertions, 12 deletions

diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c
index 8b66bd87f0c1..3327211746ac 100644
--- a/arch/mips/lantiq/xway/reset.c
+++ b/arch/mips/lantiq/xway/reset.c
@@ -11,19 +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
+/* reset request register */
+#define RCU_RST_REQ             0x0010
+/* reset status register */
+#define RCU_RST_STAT            0x0014
 
-#define LTQ_RCU_RST_STAT        0x0014
-#define LTQ_RCU_STAT_SHIFT      26
+/* 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
 
 static struct resource ltq_rcu_resource = {
         .name   = "rcu",
@@ -38,29 +50,41 @@ 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();
 }
@@ -79,7 +103,7 @@ static int __init mips_reboot_setup(void)
         ltq_rcu_membase = ioremap_nocache(ltq_rcu_resource.start,
                                 resource_size(&ltq_rcu_resource));
         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;