Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eb8ceac authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Thomas Gleixner
Browse files

[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: default avatarMaciej W. Rozycki <macro@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 21eeb7aa

drivers/mtd/devices/ms02-nv.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *	as published by the Free Software Foundation; either version

 *	as published by the Free Software Foundation; either version

 *	2 of the License, or (at your option) any later version.

 *	2 of the License, or (at your option) any later version.

 *

 *

 *	$Id: ms02-nv.c,v 1.10 2005/06/20 12:24:41 macro Exp $

 *	$Id: ms02-nv.c,v 1.11 2005/11/14 13:41:47 macro Exp $

 */

 */





#include <linux/init.h>

#include <linux/init.h>
@@ -293,13 +293,13 @@ static int __init ms02nv_init(void) 




	switch (mips_machtype) {

	switch (mips_machtype) {

	case MACH_DS5000_200:

	case MACH_DS5000_200:

		csr = (volatile u32 *)KN02_CSR_BASE;

		csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE + KN02_CSR);

		if (*csr & KN02_CSR_BNK32M)

		if (*csr & KN02_CSR_BNK32M)

			stride = 2;

			stride = 2;

		break;

		break;

	case MACH_DS5000_2X0:

	case MACH_DS5000_2X0:

	case MACH_DS5900:

	case MACH_DS5900:

		csr = (volatile u32 *)KN03_MCR_BASE;

		csr = (volatile u32 *)CKSEG1ADDR(KN03_SLOT_BASE + IOASIC_MCR);

		if (*csr & KN03_MCR_BNK32M)

		if (*csr & KN03_MCR_BNK32M)

			stride = 2;

			stride = 2;

		break;

		break;