diff options
author | Maciej W. Rozycki <macro@infradead.org> | 2005-11-14 08:41:51 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-11-29 13:25:47 -0500 |
commit | 3eb8ceac486ed9b6eceed098423f1ca6b180ec9d (patch) | |
tree | e1b2e98897563dbc03b44c349246aa89d847fdf3 /drivers/mtd/devices/ms02-nv.c | |
parent | 21eeb7aa116b1f59fc23339521173cbb13e57f1a (diff) |
[MTD] devices/ms02-nv: phys/virt address fixups
Merge from linux-mips:
Use physical addresses at the interface level, letting drivers remap
them as appropriate.
Signed-off-by: Maciej W. Rozycki <macro@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/mtd/devices/ms02-nv.c')
-rw-r--r-- | drivers/mtd/devices/ms02-nv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/devices/ms02-nv.c b/drivers/mtd/devices/ms02-nv.c index f5026cee087f..0ff2e4378244 100644 --- a/drivers/mtd/devices/ms02-nv.c +++ b/drivers/mtd/devices/ms02-nv.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * as published by the Free Software Foundation; either version | 6 | * as published by the Free Software Foundation; either version |
7 | * 2 of the License, or (at your option) any later version. | 7 | * 2 of the License, or (at your option) any later version. |
8 | * | 8 | * |
9 | * $Id: ms02-nv.c,v 1.10 2005/06/20 12:24:41 macro Exp $ | 9 | * $Id: ms02-nv.c,v 1.11 2005/11/14 13:41:47 macro Exp $ |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
@@ -293,13 +293,13 @@ static int __init ms02nv_init(void) | |||
293 | 293 | ||
294 | switch (mips_machtype) { | 294 | switch (mips_machtype) { |
295 | case MACH_DS5000_200: | 295 | case MACH_DS5000_200: |
296 | csr = (volatile u32 *)KN02_CSR_BASE; | 296 | csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE + KN02_CSR); |
297 | if (*csr & KN02_CSR_BNK32M) | 297 | if (*csr & KN02_CSR_BNK32M) |
298 | stride = 2; | 298 | stride = 2; |
299 | break; | 299 | break; |
300 | case MACH_DS5000_2X0: | 300 | case MACH_DS5000_2X0: |
301 | case MACH_DS5900: | 301 | case MACH_DS5900: |
302 | csr = (volatile u32 *)KN03_MCR_BASE; | 302 | csr = (volatile u32 *)CKSEG1ADDR(KN03_SLOT_BASE + IOASIC_MCR); |
303 | if (*csr & KN03_MCR_BNK32M) | 303 | if (*csr & KN03_MCR_BNK32M) |
304 | stride = 2; | 304 | stride = 2; |
305 | break; | 305 | break; |