summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylylov <sshtylyov@ru.mvista.com>2006-03-14 07:20:00 +0300
committerRalf Baechle <ralf@linux-mips.org>2006-03-18 16:59:27 +0000
commit86dde15b3dc36dda4bbc32a8da607675ce63ef23 (patch)
tree07af8e4e1a28efdd8bb0476dbcab02e8a40697bc
parentde62893bc0725f8b5f0445250577cd7a10b2d8f8 (diff)
downloadkernel-uprobes-86dde15b3dc36dda4bbc32a8da607675ce63ef23.tar.gz
kernel-uprobes-86dde15b3dc36dda4bbc32a8da607675ce63ef23.tar.xz
kernel-uprobes-86dde15b3dc36dda4bbc32a8da607675ce63ef23.zip
[MIPS] Fix DBAu1550 software power off.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/au1000/common/reset.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/au1000/common/reset.c b/arch/mips/au1000/common/reset.c
index 4ffccedf596..96a211400f3 100644
--- a/arch/mips/au1000/common/reset.c
+++ b/arch/mips/au1000/common/reset.c
@@ -164,13 +164,13 @@ void au1000_restart(char *command)
void au1000_halt(void)
{
-#if defined(CONFIG_MIPS_PB1550)
+#if defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_DB1550)
/* power off system */
- printk("\n** Powering off Pb1550\n");
+ printk("\n** Powering off...\n");
au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C);
au_sync();
while(1); /* should not get here */
-#endif
+#else
printk(KERN_NOTICE "\n** You can safely turn off the power\n");
#ifdef CONFIG_MIPS_MIRAGE
au_writel((1 << 26) | (1 << 10), GPIO2_OUTPUT);
@@ -187,6 +187,7 @@ void au1000_halt(void)
"wait\n\t"
".set\tmips0");
#endif
+#endif /* defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_DB1550) */
}
void au1000_power_off(void)