[ARM] 2992/1: Replace map_desc.physical with map_desc.pfn: SA1100

Patch from Deepak Saxena

SA1100 map_desc.pfn conversion

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

1 files changed, 21 insertions, 5 deletions

diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index 3f1e358455e5..93619497779c 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -369,11 +369,27 @@ EXPORT_SYMBOL(sa1100fb_lcd_power);
  */
 
 static struct map_desc standard_io_desc[] __initdata = {
- /* virtual     physical    length      type */
-  { 0xf8000000, 0x80000000, 0x00100000, MT_DEVICE }, /* PCM */
-  { 0xfa000000, 0x90000000, 0x00100000, MT_DEVICE }, /* SCM */
-  { 0xfc000000, 0xa0000000, 0x00100000, MT_DEVICE }, /* MER */
-  { 0xfe000000, 0xb0000000, 0x00200000, MT_DEVICE }  /* LCD + DMA */
+        {       /* PCM */
+                .virtual        =  0xf8000000,
+                .pfn            = __phys_to_pfn(0x80000000),
+                .length         = 0x00100000,
+                .type           = MT_DEVICE
+        }, {    /* SCM */
+                .virtual        =  0xfa000000,
+                .pfn            = __phys_to_pfn(0x90000000),
+                .length         = 0x00100000,
+                .type           = MT_DEVICE
+        }, {    /* MER */
+                .virtual        =  0xfc000000,
+                .pfn            = __phys_to_pfn(0xa0000000),
+                .length         = 0x00100000,
+                .type           = MT_DEVICE
+        }, {    /* LCD + DMA */
+                .virtual        =  0xfe000000,
+                .pfn            = __phys_to_pfn(0xb0000000),
+                .length         = 0x00200000,
+                .type           = MT_DEVICE
+        },
 };
 
 void __init sa1100_map_io(void)