Merge branch 'master' of /usr/src/ntfs-2.6/

2 files changed, 14 insertions, 5 deletions

diff --git a/arch/mips/au1000/db1x00/board_setup.c b/arch/mips/au1000/db1x00/board_setup.c
index ac05ba0ff63f..f00ec3b175d8 100644
--- a/arch/mips/au1000/db1x00/board_setup.c
+++ b/arch/mips/au1000/db1x00/board_setup.c
@@ -45,13 +45,12 @@
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-db1x00/db1x00.h>
 
-/* not correct for db1550 */
-static BCSR * const bcsr = (BCSR *)0xAE000000;
+static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
 
 void board_reset (void)
 {
         /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
-        au_writel(0x00000000, 0xAE00001C);
+        bcsr->swreset = 0x0000;
 }
 
 void __init board_setup(void)
@@ -75,7 +74,7 @@ void __init board_setup(void)
         bcsr->resets |= BCSR_RESETS_IRDA_MODE_OFF;
         au_sync();
 #endif
-        au_writel(0, 0xAE000010); /* turn off pcmcia power */
+        bcsr->pcmcia = 0x0000; /* turn off PCMCIA power */
 
 #ifdef CONFIG_MIPS_MIRAGE
         /* enable GPIO[31:0] inputs */
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c
index 4b9d5e46edbb..41e0522f3cf1 100644
--- a/arch/mips/au1000/db1x00/init.c
+++ b/arch/mips/au1000/db1x00/init.c
@@ -61,7 +61,17 @@ void __init prom_init(void)
         prom_envp = (char **) fw_arg2;
 
         mips_machgroup = MACH_GROUP_ALCHEMY;
-        mips_machtype = MACH_DB1000;    /* set the platform # */
+
+        /* Set the platform # */
+#if     defined (CONFIG_MIPS_DB1550)
+        mips_machtype = MACH_DB1550;
+#elif   defined (CONFIG_MIPS_DB1500)
+        mips_machtype = MACH_DB1500;
+#elif   defined (CONFIG_MIPS_DB1100)
+        mips_machtype = MACH_DB1100;
+#else
+        mips_machtype = MACH_DB1000;
+#endif
 
         prom_init_cmdline();