Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Maciej W. Rozycki and committed by
Thomas Gleixner
3eb8ceac 21eeb7aa

+3 -3
+3 -3
drivers/mtd/devices/ms02-nv.c
··· 6 6 * as published by the Free Software Foundation; either version 7 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 12 #include <linux/init.h> ··· 293 293 294 294 switch (mips_machtype) { 295 295 case MACH_DS5000_200: 296 - csr = (volatile u32 *)KN02_CSR_BASE; 296 + csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE + KN02_CSR); 297 297 if (*csr & KN02_CSR_BNK32M) 298 298 stride = 2; 299 299 break; 300 300 case MACH_DS5000_2X0: 301 301 case MACH_DS5900: 302 - csr = (volatile u32 *)KN03_MCR_BASE; 302 + csr = (volatile u32 *)CKSEG1ADDR(KN03_SLOT_BASE + IOASIC_MCR); 303 303 if (*csr & KN03_MCR_BNK32M) 304 304 stride = 2; 305 305 break;