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

[ARM] 2988/1: Replace map_desc.physical with map_desc.pfn: PXA 



Patch from Deepak Saxena

PXA 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 9fe133b1

arch/arm/mach-pxa/generic.c

+36 −8
Original line number Diff line number Diff line
@@ -92,14 +92,42 @@ EXPORT_SYMBOL(pxa_set_cken); 
 *         and cache flush area.

 */

static struct map_desc standard_io_desc[] __initdata = {

 /* virtual     physical    length      type */

  { 0xf2000000, 0x40000000, 0x02000000, MT_DEVICE }, /* Devs */

  { 0xf4000000, 0x44000000, 0x00100000, MT_DEVICE }, /* LCD */

  { 0xf6000000, 0x48000000, 0x00100000, MT_DEVICE }, /* Mem Ctl */

  { 0xf8000000, 0x4c000000, 0x00100000, MT_DEVICE }, /* USB host */

  { 0xfa000000, 0x50000000, 0x00100000, MT_DEVICE }, /* Camera */

  { 0xfe000000, 0x58000000, 0x00100000, MT_DEVICE }, /* IMem ctl */

  { 0xff000000, 0x00000000, 0x00100000, MT_DEVICE }  /* UNCACHED_PHYS_0 */

  	{	/* Devs */

		.virtual	=  0xf2000000,

		.pfn		= __phys_to_pfn(0x40000000),

		.length		= 0x02000000,

		.type		= MT_DEVICE

	}, {	/* LCD */

		.virtual	=  0xf4000000,

		.pfn		= __phys_to_pfn(0x44000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}, {	/* Mem Ctl */

		.virtual	=  0xf6000000,

		.pfn		= __phys_to_pfn(0x48000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}, {	/* USB host */

		.virtual	=  0xf8000000,

		.pfn		= __phys_to_pfn(0x4c000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}, {	/* Camera */

		.virtual	=  0xfa000000,

		.pfn		= __phys_to_pfn(0x50000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}, {	/* IMem ctl */

		.virtual	=  0xfe000000,

		.pfn		= __phys_to_pfn(0x58000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}, {	/* UNCACHED_PHYS_0 */

		.virtual	= 0xff000000,

		.pfn		= __phys_to_pfn(0x00000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}

};



void __init pxa_map_io(void)

arch/arm/mach-pxa/idp.c

+11 −10
Original line number Diff line number Diff line
@@ -152,16 +152,17 @@ static void __init idp_init_irq(void) 
}



static struct map_desc idp_io_desc[] __initdata = {

 /* virtual     physical    length      type */



  { IDP_COREVOLT_VIRT,

    IDP_COREVOLT_PHYS,

    IDP_COREVOLT_SIZE,

    MT_DEVICE },

  { IDP_CPLD_VIRT,

    IDP_CPLD_PHYS,

    IDP_CPLD_SIZE,

    MT_DEVICE }

  	{

		.virtual	=  IDP_COREVOLT_VIRT,

		.pfn		= __phys_to_pfn(IDP_COREVOLT_PHYS),

		.length		= IDP_COREVOLT_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	=  IDP_CPLD_VIRT,

		.pfn		= __phys_to_pfn(IDP_CPLD_PHYS),

		.length		= IDP_CPLD_SIZE,

		.type		= MT_DEVICE

	}

};



static void __init idp_map_io(void)

arch/arm/mach-pxa/lubbock.c

+6 −1
Original line number Diff line number Diff line
@@ -246,7 +246,12 @@ static void __init lubbock_init(void) 
}



static struct map_desc lubbock_io_desc[] __initdata = {

  { LUBBOCK_FPGA_VIRT, LUBBOCK_FPGA_PHYS, 0x00100000, MT_DEVICE }, /* CPLD */

  	{	/* CPLD */

		.virtual	=  LUBBOCK_FPGA_VIRT,

		.pfn		= __phys_to_pfn(LUBBOCK_FPGA_PHYS),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}

};



static void __init lubbock_map_io(void)

arch/arm/mach-pxa/mainstone.c

+6 −1
Original line number Diff line number Diff line
@@ -317,7 +317,12 @@ static void __init mainstone_init(void) 




static struct map_desc mainstone_io_desc[] __initdata = {

  { MST_FPGA_VIRT, MST_FPGA_PHYS, 0x00100000, MT_DEVICE }, /* CPLD */

  	{	/* CPLD */

		.virtual	=  MST_FPGA_VIRT,

		.pfn		= __phys_to_pfn(MST_FPGA_PHYS),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}

};



static void __init mainstone_map_io(void)