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

[ARM] 2984/1: Replace map_desc.physical with map_desc.pfn: IXP2000 



Patch from Deepak Saxena

IXP2000 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 4835e64a

arch/arm/mach-ixp2000/core.c

+8 −8
Original line number Diff line number Diff line
@@ -83,42 +83,42 @@ void ixp2000_release_slowport(struct slowport_cfg *old_cfg) 
static struct map_desc ixp2000_io_desc[] __initdata = {

	{

		.virtual	= IXP2000_CAP_VIRT_BASE,

		.physical	= IXP2000_CAP_PHYS_BASE,

		.pfn		= __phys_to_pfn(IXP2000_CAP_PHYS_BASE),

		.length		= IXP2000_CAP_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= IXP2000_INTCTL_VIRT_BASE,

		.physical	= IXP2000_INTCTL_PHYS_BASE,

		.pfn		= __phys_to_pfn(IXP2000_INTCTL_PHYS_BASE),

		.length		= IXP2000_INTCTL_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= IXP2000_PCI_CREG_VIRT_BASE,

		.physical	= IXP2000_PCI_CREG_PHYS_BASE,

		.pfn		= __phys_to_pfn(IXP2000_PCI_CREG_PHYS_BASE),

		.length		= IXP2000_PCI_CREG_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= IXP2000_PCI_CSR_VIRT_BASE,

		.physical	= IXP2000_PCI_CSR_PHYS_BASE,

		.pfn		= __phys_to_pfn(IXP2000_PCI_CSR_PHYS_BASE),

		.length		= IXP2000_PCI_CSR_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= IXP2000_MSF_VIRT_BASE,

		.physical	= IXP2000_MSF_PHYS_BASE,

		.pfn		= __phys_to_pfn(IXP2000_MSF_PHYS_BASE),

		.length		= IXP2000_MSF_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= IXP2000_PCI_IO_VIRT_BASE,

		.physical	= IXP2000_PCI_IO_PHYS_BASE,

		.pfn		= __phys_to_pfn(IXP2000_PCI_IO_PHYS_BASE),

		.length		= IXP2000_PCI_IO_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= IXP2000_PCI_CFG0_VIRT_BASE,

		.physical	= IXP2000_PCI_CFG0_PHYS_BASE,

		.pfn		= __phys_to_pfn(IXP2000_PCI_CFG0_PHYS_BASE),

		.length		= IXP2000_PCI_CFG0_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= IXP2000_PCI_CFG1_VIRT_BASE,

		.physical	= IXP2000_PCI_CFG1_PHYS_BASE,

		.pfn		= __phys_to_pfn(IXP2000_PCI_CFG1_PHYS_BASE),

		.length		= IXP2000_PCI_CFG1_SIZE,

		.type		= MT_DEVICE

	}

arch/arm/mach-ixp2000/ixdp2x00.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ void ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long 
 *************************************************************************/

static struct map_desc ixdp2x00_io_desc __initdata = {

	.virtual	= IXDP2X00_VIRT_CPLD_BASE, 

	.physical	= IXDP2X00_PHYS_CPLD_BASE,

	.pfn		= __phys_to_pfn(IXDP2X00_PHYS_CPLD_BASE),

	.length		= IXDP2X00_CPLD_SIZE,

	.type		= MT_DEVICE

};

arch/arm/mach-ixp2000/ixdp2x01.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ void __init ixdp2x01_init_irq(void) 
 *************************************************************************/

static struct map_desc ixdp2x01_io_desc __initdata = {

	.virtual	= IXDP2X01_VIRT_CPLD_BASE, 

	.physical	= IXDP2X01_PHYS_CPLD_BASE,

	.pfn		= __phys_to_pfn(IXDP2X01_PHYS_CPLD_BASE),

	.length		= IXDP2X01_CPLD_REGION_SIZE,

	.type		= MT_DEVICE

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE