diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-11-20 15:38:50 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-28 13:18:49 +0900 |
| commit | a7aa92d1b499a3ad67b36137445ecb1411a4533b (patch) | |
| tree | 2c09f0e9a1032ca8fcb368913c3ec461df76d6d4 /arch | |
| parent | b4db3aec8351c78df77bbd95f1951a4dd0246853 (diff) | |
| download | blackbird-op-linux-a7aa92d1b499a3ad67b36137445ecb1411a4533b.tar.gz blackbird-op-linux-a7aa92d1b499a3ad67b36137445ecb1411a4533b.zip | |
sh: Kill off SH-5 enter_deep_standby() cruft.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/kernel/process_64.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c index 0c2bc61b66b3..47415671da0c 100644 --- a/arch/sh/kernel/process_64.c +++ b/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; |
