]> err.no Git - linux-2.6/commitdiff
[MIPS] Fix DBAu1550 software power off.
authorSergei Shtylylov <sshtylyov@ru.mvista.com>
Tue, 14 Mar 2006 04:20:00 +0000 (07:20 +0300)
committerRalf Baechle <ralf@linux-mips.org>
Sat, 18 Mar 2006 16:59:27 +0000 (16:59 +0000)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/au1000/common/reset.c

index 4ffccedf5967dcf4326e2074e339976ddda8ee8c..96a211400f34246be965732007c1c343c25d5969 100644 (file)
@@ -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)