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

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

[ARM] 3001/1: Replace map_desc.physical with map_desc.pfn: Integrator 



Patch from Deepak Saxena

Integrator 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 adecef74

arch/arm/mach-integrator/integrator_ap.c

+66 −13
Original line number Diff line number Diff line
@@ -75,19 +75,72 @@ 
 */



static struct map_desc ap_io_desc[] __initdata = {

 { IO_ADDRESS(INTEGRATOR_HDR_BASE),   INTEGRATOR_HDR_BASE,   SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_SC_BASE),    INTEGRATOR_SC_BASE,    SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_EBI_BASE),   INTEGRATOR_EBI_BASE,   SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_CT_BASE),    INTEGRATOR_CT_BASE,    SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_IC_BASE),    INTEGRATOR_IC_BASE,    SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_UART0_BASE), INTEGRATOR_UART0_BASE, SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_UART1_BASE), INTEGRATOR_UART1_BASE, SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_DBG_BASE),   INTEGRATOR_DBG_BASE,   SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_GPIO_BASE),  INTEGRATOR_GPIO_BASE,  SZ_4K,  MT_DEVICE },

 { PCI_MEMORY_VADDR,                  PHYS_PCI_MEM_BASE,     SZ_16M, MT_DEVICE },

 { PCI_CONFIG_VADDR,                  PHYS_PCI_CONFIG_BASE,  SZ_16M, MT_DEVICE },

 { PCI_V3_VADDR,                      PHYS_PCI_V3_BASE,      SZ_64K, MT_DEVICE },

 { PCI_IO_VADDR,                      PHYS_PCI_IO_BASE,      SZ_64K, MT_DEVICE }

	{

		.virtual	= IO_ADDRESS(INTEGRATOR_HDR_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_HDR_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_SC_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_SC_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_EBI_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_EBI_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_CT_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_CT_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_IC_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_IC_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_UART0_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_UART0_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_UART1_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_UART1_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_DBG_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_DBG_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_GPIO_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_GPIO_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= PCI_MEMORY_VADDR,

		.pfn		= __phys_to_pfn(PHYS_PCI_MEM_BASE),

		.length		= SZ_16M,

		.type		= MT_DEVICE

	}, {

		.virtual	= PCI_CONFIG_VADDR,

		.pfn		= __phys_to_pfn(PHYS_PCI_CONFIG_BASE),

		.length		= SZ_16M,

		.type		= MT_DEVICE

	}, {

		.virtual	= PCI_V3_VADDR,

		.pfn		= __phys_to_pfn(PHYS_PCI_V3_BASE),

		.length		= SZ_64K,

		.type		= MT_DEVICE

	}, {

		.virtual	= PCI_IO_VADDR,

		.pfn		= __phys_to_pfn(PHYS_PCI_IO_BASE),

		.length		= SZ_64K,

		.type		= MT_DEVICE

	}

};



static void __init ap_map_io(void)

arch/arm/mach-integrator/integrator_cp.c

+56 −11
Original line number Diff line number Diff line
@@ -74,17 +74,62 @@ 
 */



static struct map_desc intcp_io_desc[] __initdata = {

 { IO_ADDRESS(INTEGRATOR_HDR_BASE),   INTEGRATOR_HDR_BASE,   SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_SC_BASE),    INTEGRATOR_SC_BASE,    SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_EBI_BASE),   INTEGRATOR_EBI_BASE,   SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_CT_BASE),    INTEGRATOR_CT_BASE,    SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_IC_BASE),    INTEGRATOR_IC_BASE,    SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_UART0_BASE), INTEGRATOR_UART0_BASE, SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_UART1_BASE), INTEGRATOR_UART1_BASE, SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_DBG_BASE),   INTEGRATOR_DBG_BASE,   SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_GPIO_BASE),  INTEGRATOR_GPIO_BASE,  SZ_4K,  MT_DEVICE },

 { 0xfca00000, 0xca000000, SZ_4K, MT_DEVICE },

 { 0xfcb00000, 0xcb000000, SZ_4K, MT_DEVICE },

	{

		.virtual	= IO_ADDRESS(INTEGRATOR_HDR_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_HDR_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_SC_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_SC_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_EBI_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_EBI_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_CT_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_CT_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_IC_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_IC_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_UART0_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_UART0_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_UART1_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_UART1_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_DBG_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_DBG_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= IO_ADDRESS(INTEGRATOR_GPIO_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_GPIO_BASE),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= 0xfca00000,

		.pfn		= __phys_to_pfn(0xca000000),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}, {

		.virtual	= 0xfcb00000,

		.pfn		= __phys_to_pfn(0xcb000000),

		.length		= SZ_4K,

		.type		= MT_DEVICE

	}

};



static void __init intcp_map_io(void)