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

Commit cbe69f95 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 3138/1: SMDK2440 - fix map_desc initialisation (and ISA memory space) 



Patch from Ben Dooks

Fix the map_desc initialisers for the SMDK2440 machine
to use the new .pfn method, and at the same time making
the differntiation between ISA IO and Memory space
accesses

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ff6ffa82

arch/arm/mach-s3c2410/mach-smdk2440.c

+21 −2
Original line number Diff line number Diff line
@@ -58,8 +58,27 @@ 
static struct map_desc smdk2440_iodesc[] __initdata = {

	/* ISA IO Space map (memory space selected by A24) */



	{ (u32)S3C24XX_VA_ISA_WORD, S3C2410_CS2, SZ_16M, MT_DEVICE },

	{ (u32)S3C24XX_VA_ISA_BYTE, S3C2410_CS2, SZ_16M, MT_DEVICE },

	{

		.virtual	= (u32)S3C24XX_VA_ISA_WORD,

		.pfn		= __phys_to_pfn(S3C2410_CS2),

		.length		= 0x10000,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (u32)S3C24XX_VA_ISA_WORD + 0x10000,

		.pfn		= __phys_to_pfn(S3C2410_CS2 + (1<<24)),

		.length		= SZ_4M,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (u32)S3C24XX_VA_ISA_BYTE,

		.pfn		= __phys_to_pfn(S3C2410_CS2),

		.length		= 0x10000,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (u32)S3C24XX_VA_ISA_BYTE + 0x10000,

		.pfn		= __phys_to_pfn(S3C2410_CS2 + (1<<24)),

		.length		= SZ_4M,

		.type		= MT_DEVICE,

	}

};



#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK