git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
mips
/
au1000
/
common
/
reset.c
diff --git
a/arch/mips/au1000/common/reset.c
b/arch/mips/au1000/common/reset.c
index
65b84db
..
de5447e
100644
(file)
--- a/
arch/mips/au1000/common/reset.c
+++ b/
arch/mips/au1000/common/reset.c
@@
-27,7
+27,6
@@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <asm/io.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <asm/io.h>
@@
-151,7
+150,7
@@
void au1000_restart(char *command)
}
set_c0_status(ST0_BEV | ST0_ERL);
}
set_c0_status(ST0_BEV | ST0_ERL);
-
set_c0_config(
CONF_CM_UNCACHED);
+
change_c0_config(CONF_CM_CMASK,
CONF_CM_UNCACHED);
flush_cache_all();
write_c0_wired(0);
flush_cache_all();
write_c0_wired(0);
@@
-164,17
+163,20
@@
void au1000_restart(char *command)
void au1000_halt(void)
{
void au1000_halt(void)
{
-#if defined(CONFIG_MIPS_PB1550)
+#if defined(CONFIG_MIPS_PB1550)
|| defined(CONFIG_MIPS_DB1550)
/* power off system */
/* 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 */
au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C);
au_sync();
while(1); /* should not get here */
-#e
ndif
+#e
lse
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
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();
#ifdef CONFIG_PM
au_sleep();
@@
-187,6
+189,7
@@
void au1000_halt(void)
"wait\n\t"
".set\tmips0");
#endif
"wait\n\t"
".set\tmips0");
#endif
+#endif /* defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_DB1550) */
}
void au1000_power_off(void)
}
void au1000_power_off(void)