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
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
mips
/
au1000
/
mtx-1
/
board_setup.c
diff --git
a/arch/mips/au1000/mtx-1/board_setup.c
b/arch/mips/au1000/mtx-1/board_setup.c
index
54a89a6
..
638de7b
100644
(file)
--- a/
arch/mips/au1000/mtx-1/board_setup.c
+++ b/
arch/mips/au1000/mtx-1/board_setup.c
@@
-34,24
+34,24
@@
#include <linux/ioport.h>
#include <linux/mm.h>
#include <linux/console.h>
#include <linux/ioport.h>
#include <linux/mm.h>
#include <linux/console.h>
-#include <linux/mc146818rtc.h>
#include <linux/delay.h>
#include <asm/cpu.h>
#include <asm/bootinfo.h>
#include <asm/irq.h>
#include <linux/delay.h>
#include <asm/cpu.h>
#include <asm/bootinfo.h>
#include <asm/irq.h>
-#include <asm/keyboard.h>
#include <asm/mipsregs.h>
#include <asm/reboot.h>
#include <asm/pgtable.h>
#include <asm/mipsregs.h>
#include <asm/reboot.h>
#include <asm/pgtable.h>
-#include <asm/au1000.h>
+#include <asm/
mach-au1x00/
au1000.h>
-extern struct rtc_ops no_rtc_ops;
+void board_reset (void)
+{
+ /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
+ au_writel(0x00000000, 0xAE00001C);
+}
void __init board_setup(void)
{
void __init board_setup(void)
{
- rtc_ops = &no_rtc_ops;
-
#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
#ifdef CONFIG_AU1X00_USB_DEVICE
// 2nd USB port is USB device
#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
#ifdef CONFIG_AU1X00_USB_DEVICE
// 2nd USB port is USB device
@@
-60,7
+60,7
@@
void __init board_setup(void)
// enable USB power switch
au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
au_writel( 0x100000, GPIO2_OUTPUT );
// enable USB power switch
au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
au_writel( 0x100000, GPIO2_OUTPUT );
-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1
0
00_USB_DEVICE)
+#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1
X
00_USB_DEVICE)
#ifdef CONFIG_PCI
#if defined(__MIPSEB__)
#ifdef CONFIG_PCI
#if defined(__MIPSEB__)