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

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

[ARM] 2998/1: Replace map_desc.physical with map_desc.pfn: Footbridge 



Patch from Deepak Saxena

Footbridge 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 6cb1907c

arch/arm/mach-footbridge/common.c

+48 −9
Original line number Diff line number Diff line
@@ -130,8 +130,17 @@ void __init footbridge_init_irq(void) 
 * it means that we have extra bullet protection on our feet.

 */

static struct map_desc fb_common_io_desc[] __initdata = {

 { ARMCSR_BASE,	 DC21285_ARMCSR_BASE,	    ARMCSR_SIZE,  MT_DEVICE },

 { XBUS_BASE,    0x40000000,		    XBUS_SIZE,    MT_DEVICE }

	{

		.virtual	= ARMCSR_BASE,

		.pfn		= DC21285_ARMCSR_BASE,

		.length		= ARMCSR_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= XBUS_BASE,

		.pfn		= __phys_to_pfn(0x40000000),

		.length		= XBUS_SIZE,

		.type		= MT_DEVICE

	}

};



/*
@@ -140,11 +149,32 @@ static struct map_desc fb_common_io_desc[] __initdata = { 
 */

static struct map_desc ebsa285_host_io_desc[] __initdata = {

#if defined(CONFIG_ARCH_FOOTBRIDGE) && defined(CONFIG_FOOTBRIDGE_HOST)

 { PCIMEM_BASE,  DC21285_PCI_MEM,	    PCIMEM_SIZE,  MT_DEVICE },

 { PCICFG0_BASE, DC21285_PCI_TYPE_0_CONFIG, PCICFG0_SIZE, MT_DEVICE },

 { PCICFG1_BASE, DC21285_PCI_TYPE_1_CONFIG, PCICFG1_SIZE, MT_DEVICE },

 { PCIIACK_BASE, DC21285_PCI_IACK,	    PCIIACK_SIZE, MT_DEVICE },

 { PCIO_BASE,    DC21285_PCI_IO,	    PCIO_SIZE,	  MT_DEVICE }

	{

		.virtual	= PCIMEM_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_MEM),

		.length		= PCIMEM_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= PCICFG0_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_TYPE_0_CONFIG),

		.length		= PCICFG0_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= PCICFG1_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_TYPE_1_CONFIG),

		.length		= PCICFG1_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= PCIIACK_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_IACK),

		.length		= PCIIACK_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= PCIO_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_IO),

		.length		= PCIO_SIZE,

		.type		= MT_DEVICE

	}

#endif

};
@@ -153,8 +183,17 @@ static struct map_desc ebsa285_host_io_desc[] __initdata = { 
 */

static struct map_desc co285_io_desc[] __initdata = {

#ifdef CONFIG_ARCH_CO285

 { PCIO_BASE,	 DC21285_PCI_IO,	    PCIO_SIZE,    MT_DEVICE },

 { PCIMEM_BASE,	 DC21285_PCI_MEM,	    PCIMEM_SIZE,  MT_DEVICE }

	{

		.virtual	= PCIO_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_IO),

		.length		= PCIO_SIZE,

		.type		= MT_DEVICE

	}, {

		.virtual	= PCIMEM_BASE,

		.pfn		= __phys_to_pfn(DC21285_PCI_MEM),

		.length		= PCIMEM_SIZE,

		.type		= MT_DEVICE

	}

#endif

};