From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 29 Nov 2005 16:01:32 +0000 (+0000)
Subject: [MIPS] Alchemy: Fix BCSR accesses.
X-Git-Tag: v2.6.15-rc5~18^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dea91002d45e4f0fe83768703288e1cde917371c;p=linux-2.6-omap-h63xx.git

[MIPS] Alchemy: Fix BCSR accesses.

Fixes BCSR accesses in the board setup/reset code.  The registers are
actually 16-bit, and their addresses are different between DBAu1550 and
other DBAu1xx0 boards.

From Sergei Shtylylov <sshtylyov@ru.mvista.com>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/au1000/db1x00/board_setup.c b/arch/mips/au1000/db1x00/board_setup.c
index ac05ba0ff63..f00ec3b175d 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 */