[ARM] 2996/1: Replace map_desc.physical with map_desc.pfn: EPXA10DB

Patch from Deepak Saxena

EPXA10DB mapd_desc.pfn conversion

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-epxa10db/mm.c b/arch/arm/mach-epxa10db/mm.c
index 2aa57fa..e8832d0 100644 (file)
--- a/arch/arm/mach-epxa10db/mm.c
+++ b/arch/arm/mach-epxa10db/mm.c
@@ -31,12 +31,37 @@
 /* Page table mapping for I/O region */
  
 static struct map_desc epxa10db_io_desc[] __initdata = {
- { IO_ADDRESS(EXC_REGISTERS_BASE),   EXC_REGISTERS_BASE,    SZ_16K, MT_DEVICE }, 
- { IO_ADDRESS(EXC_PLD_BLOCK0_BASE),  EXC_PLD_BLOCK0_BASE,   SZ_16K, MT_DEVICE }, 
- { IO_ADDRESS(EXC_PLD_BLOCK1_BASE),  EXC_PLD_BLOCK1_BASE,   SZ_16K, MT_DEVICE }, 
- { IO_ADDRESS(EXC_PLD_BLOCK2_BASE),  EXC_PLD_BLOCK2_BASE,   SZ_16K, MT_DEVICE }, 
- { IO_ADDRESS(EXC_PLD_BLOCK3_BASE),  EXC_PLD_BLOCK3_BASE,   SZ_16K, MT_DEVICE }, 
- { FLASH_VADDR(EXC_EBI_BLOCK0_BASE), EXC_EBI_BLOCK0_BASE,   SZ_16M, MT_DEVICE }
+       {
+               .virtual        = IO_ADDRESS(EXC_REGISTERS_BASE),
+               .pfn            = __phys_to_pfn(EXC_REGISTERS_BASE),
+               .length         = SZ_16K,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IO_ADDRESS(EXC_PLD_BLOCK0_BASE),
+               .pfn            = __phys_to_pfn(EXC_PLD_BLOCK0_BASE),
+               .length         = SZ_16K,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IO_ADDRESS(EXC_PLD_BLOCK1_BASE),
+               .pfn            =__phys_to_pfn(EXC_PLD_BLOCK1_BASE),
+               .length         = SZ_16K,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IO_ADDRESS(EXC_PLD_BLOCK2_BASE),
+               .physical       = __phys_to_pfn(EXC_PLD_BLOCK2_BASE),
+               .length         = SZ_16K,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IO_ADDRESS(EXC_PLD_BLOCK3_BASE),
+               .pfn            = __phys_to_pfn(EXC_PLD_BLOCK3_BASE),
+               .length         = SZ_16K,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = FLASH_VADDR(EXC_EBI_BLOCK0_BASE),
+               .pfn            = __phys_to_pfn(EXC_EBI_BLOCK0_BASE),
+               .length         = SZ_16M,
+               .type           = MT_DEVICE
+       }
 };
 
 void __init epxa10db_map_io(void)