From 51aaf1d11f6616f4cd712b8dff68b5daf9e6f0ca Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 20 Nov 2007 15:38:50 +0900
Subject: [PATCH] --- yaml --- r: 77746 b: refs/heads/master c:
 a7aa92d1b499a3ad67b36137445ecb1411a4533b h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/arch/sh/kernel/process_64.c | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 71ba11a92a2e..e474cd696007 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4db3aec8351c78df77bbd95f1951a4dd0246853
+refs/heads/master: a7aa92d1b499a3ad67b36137445ecb1411a4533b
diff --git a/trunk/arch/sh/kernel/process_64.c b/trunk/arch/sh/kernel/process_64.c
index 0c2bc61b66b3..47415671da0c 100644
--- a/trunk/arch/sh/kernel/process_64.c
+++ b/trunk/arch/sh/kernel/process_64.c
@@ -27,6 +27,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
+#include <linux/io.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 
@@ -106,9 +107,20 @@ void machine_halt(void)
 
 void machine_power_off(void)
 {
-	extern void enter_deep_standby(void);
+#if 0
+	/* Disable watchdog timer */
+	ctrl_outl(0xa5000000, WTCSR);
+	/* Configure deep standby on sleep */
+	ctrl_outl(0x03, STBCR);
+#endif
+
+	__asm__ __volatile__ (
+		"sleep\n\t"
+		"synci\n\t"
+		"nop;nop;nop;nop\n\t"
+	);
 
-	enter_deep_standby();
+	panic("Unexpected wakeup!\n");
 }
 
 void (*pm_power_off)(void) = machine_power_off;