diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-03-20 04:38:03 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-20 04:38:03 -0500 |
| commit | d378aca6ec708bfb24df5c47801b1f2399efc481 (patch) | |
| tree | 7535f96bf34314df071698d2e06054b8d5223ebb /arch/mips/au1000/common/reset.c | |
| parent | Merge branch 'upstream-fixes' (diff) | |
| parent | Linux 2.6.16 (diff) | |
| download | linux-dev-d378aca6ec708bfb24df5c47801b1f2399efc481.tar.xz linux-dev-d378aca6ec708bfb24df5c47801b1f2399efc481.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/au1000/common/reset.c')
| -rw-r--r-- | arch/mips/au1000/common/reset.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/mips/au1000/common/reset.c b/arch/mips/au1000/common/reset.c index 4ffccedf5967..c93af224c1b3 100644 --- a/arch/mips/au1000/common/reset.c +++ b/arch/mips/au1000/common/reset.c @@ -164,17 +164,20 @@ 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); #endif +#ifdef CONFIG_MIPS_DB1200 + au_writew(au_readw(0xB980001C) | (1<<14), 0xB980001C); +#endif #ifdef CONFIG_PM au_sleep(); @@ -187,6 +190,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) |