[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>

diff --git a/arch/arm/mach-iop3xx/iop321-setup.c b/arch/arm/mach-iop3xx/iop321-setup.c
index 0f921ba2750c2f8a7cc0e2ce9ca94c53c4753b41..bb5091223b638120291b9ee15e78693ff227638f 100644 (file)
--- a/arch/arm/mach-iop3xx/iop321-setup.c
+++ b/arch/arm/mach-iop3xx/iop321-setup.c
@@ -38,13 +38,17 @@
  * Standard IO mapping for all IOP321 based systems
  */
 static struct map_desc iop321_std_desc[] __initdata = {
- /* virtual     physical      length      type */
-
- /* mem mapped registers */
- { IOP321_VIRT_MEM_BASE,  IOP321_PHYS_MEM_BASE,   0x00002000,  MT_DEVICE },
-
- /* PCI IO space */
- { IOP321_PCI_LOWER_IO_VA,  IOP321_PCI_LOWER_IO_PA,   IOP321_PCI_IO_WINDOW_SIZE,  MT_DEVICE }
+        {      /* mem mapped registers */
+               .virtual        = IOP321_VIRT_MEM_BASE,
+               .pfn            = __phys_to_pfn(IOP321_PHYS_MEM_BASE),
+               .length         = 0x00002000,
+               .type           = MT_DEVICE
+        }, {   /* PCI IO space */
+               .virtual        = IOP321_PCI_LOWER_IO_VA,
+               .pfn            = __phys_to_pfn(IOP321_PCI_LOWER_IO_PA),
+               .length         = IOP321_PCI_IO_WINDOW_SIZE,
+               .type           = MT_DEVICE
+        }
 };
 
 #ifdef CONFIG_ARCH_IQ80321

diff --git a/arch/arm/mach-iop3xx/iop331-setup.c b/arch/arm/mach-iop3xx/iop331-setup.c
index fc74b722f72f749be8fc81ae854f2fe150d9fce7..a2533c3ab42f6671f26d5d84250b30410e5ac1f7 100644 (file)
--- 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[] = {

diff --git a/arch/arm/mach-iop3xx/iq31244-mm.c b/arch/arm/mach-iop3xx/iq31244-mm.c
index 55992ab586baf87d2418f2f91c865460321b04a0..e874b54eefe3782c7d2e9c48ffcf550e246e1223 100644 (file)
--- a/arch/arm/mach-iop3xx/iq31244-mm.c
+++ b/arch/arm/mach-iop3xx/iq31244-mm.c
@@ -29,10 +29,12 @@
  * We use RedBoot's setup for the onboard devices.
  */
 static struct map_desc iq31244_io_desc[] __initdata = {
- /* virtual     physical      length        type */
-
- /* on-board devices */
- { IQ31244_UART, IQ31244_UART,   0x00100000,   MT_DEVICE }
+       {       /* on-board devices */
+               .virtual        = IQ31244_UART,
+               .pfn            = __phys_to_pfn(IQ31244_UART),
+               .length         = 0x00100000,
+               .type           = MT_DEVICE
+       }
 };
 
 void __init iq31244_map_io(void)

diff --git a/arch/arm/mach-iop3xx/iq80321-mm.c b/arch/arm/mach-iop3xx/iq80321-mm.c
index bb3e9e5a9aff0e218ec0e9967e680cdecd2160e7..d9cac5e1fc3d9b7c197d3fb5e6af731ae16b53ef 100644 (file)
--- a/arch/arm/mach-iop3xx/iq80321-mm.c
+++ b/arch/arm/mach-iop3xx/iq80321-mm.c
@@ -29,10 +29,12 @@
  * We use RedBoot's setup for the onboard devices.
  */
 static struct map_desc iq80321_io_desc[] __initdata = {
- /* virtual     physical      length        type */
-
- /* on-board devices */
- { IQ80321_UART, IQ80321_UART,   0x00100000,   MT_DEVICE }
+       {       /* on-board devices */
+               .virtual        = IQ80321_UART,
+               .pfn            = __phys_to_pfn(IQ80321_UART),
+               .length         = 0x00100000,
+               .type           = MT_DEVICE
+       }
 };
 
 void __init iq80321_map_io(void)