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

Commit adecef74 authored by Deepak Saxena's avatar Deepak Saxena Committed by Russell King
Browse files

[ARM] 3000/1: Replace map_desc.physical with map_desc.pfn: iMX 



Patch from Deepak Saxena

iMX map_desc.pfn conversion

Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3e9635e4

arch/arm/mach-imx/generic.c

+6 −2
Original line number Diff line number Diff line
@@ -273,8 +273,12 @@ static struct platform_device *devices[] __initdata = { 
};



static struct map_desc imx_io_desc[] __initdata = {

	/* virtual     physical    length      type */

	{IMX_IO_BASE, IMX_IO_PHYS, IMX_IO_SIZE, MT_DEVICE},

	{

		.virtual	= IMX_IO_BASE,

		.pfn		= __phys_to_pfn(IMX_IO_PHYS),

		.length		= IMX_IO_SIZE,

		.type		= MT_DEVICE

	}

};



void __init

arch/arm/mach-imx/mx1ads.c

+31 −7
Original line number Diff line number Diff line
@@ -61,13 +61,37 @@ mx1ads_init(void) 
}



static struct map_desc mx1ads_io_desc[] __initdata = {

	/* virtual     physical    length      type */

	{IMX_CS0_VIRT, IMX_CS0_PHYS, IMX_CS0_SIZE, MT_DEVICE},

	{IMX_CS1_VIRT, IMX_CS1_PHYS, IMX_CS1_SIZE, MT_DEVICE},

	{IMX_CS2_VIRT, IMX_CS2_PHYS, IMX_CS2_SIZE, MT_DEVICE},

	{IMX_CS3_VIRT, IMX_CS3_PHYS, IMX_CS3_SIZE, MT_DEVICE},

	{IMX_CS4_VIRT, IMX_CS4_PHYS, IMX_CS4_SIZE, MT_DEVICE},

	{IMX_CS5_VIRT, IMX_CS5_PHYS, IMX_CS5_SIZE, MT_DEVICE},

	{

		.virtual	= IMX_CS0_VIRT,

		.pfn		= __phys_to_pfn(IMX_CS0_PHYS),

		.length		= IMX_CS0_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= IMX_CS1_VIRT,

		.pfn		= __phys_to_pfn(IMX_CS1_PHYS),

		.length		= IMX_CS1_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= IMX_CS2_VIRT,

		.pfn		= __phys_to_pfn(IMX_CS2_PHYS),

		.length		= IMX_CS2_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= IMX_CS3_VIRT,

		.pfn		= __phys_to_pfn(IMX_CS3_PHYS),

		.length		= IMX_CS3_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= IMX_CS4_VIRT,

		.pfn		= __phys_to_pfn(IMX_CS4_PHYS),

		.length		= IMX_CS4_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= IMX_CS5_VIRT,

		.pfn		= __phys_to_pfn(IMX_CS5_PHYS),

		.length		= IMX_CS5_SIZE,

		.type		= MT_DEVICE

	}

};



static void __init