[ARM] 2983/1: Replace map_desc.physical with map_desc.pfn: IOP3xx

Patch from Deepak Saxena

IOP3xx 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, 11 insertions, 7 deletions

diff --git a/arch/arm/mach-iop3xx/iop331-setup.c b/arch/arm/mach-iop3xx/iop331-setup.c
index fc74b722f72f..a2533c3ab42f 100644
--- a/arch/arm/mach-iop3xx/iop331-setup.c
+++ b/arch/arm/mach-iop3xx/iop331-setup.c
@@ -37,13 +37,17 @@
  * Standard IO mapping for all IOP331 based systems
  */
 static struct map_desc iop331_std_desc[] __initdata = {
- /* virtual     physical      length      type */
-
- /* mem mapped registers */
- { IOP331_VIRT_MEM_BASE,  IOP331_PHYS_MEM_BASE,   0x00002000,  MT_DEVICE },
-
- /* PCI IO space */
- { IOP331_PCI_LOWER_IO_VA,  IOP331_PCI_LOWER_IO_PA,   IOP331_PCI_IO_WINDOW_SIZE,  MT_DEVICE }
+        {       /* mem mapped registers */
+                .virtual        = IOP331_VIRT_MEM_BASE,
+                .pfn            = __phys_to_pfn(IOP331_PHYS_MEM_BASE),
+                .length         = 0x00002000,
+                .type           = MT_DEVICE
+        }, {    /* PCI IO space */
+                .virtual        = IOP331_PCI_LOWER_IO_VA,
+                .pfn            = __phys_to_pfn(IOP331_PCI_LOWER_IO_PA),
+                .length         = IOP331_PCI_IO_WINDOW_SIZE,
+                .type           = MT_DEVICE
+        }
 };
 
 static struct uart_port iop331_serial_ports[] = {