[ARM] 3000/1: Replace map_desc.physical with map_desc.pfn: iMX

Patch from Deepak Saxena

iMX 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-imx/generic.c b/arch/arm/mach-imx/generic.c
index f8a742b..cb14b06 100644 (file)
--- a/arch/arm/mach-imx/generic.c
+++ b/arch/arm/mach-imx/generic.c
@@ -273,8 +273,12 @@ static struct platform_device *devices[] __initdata = {
 };
 
 static struct map_desc imx_io_desc[] __initdata = {
-       /* virtual     physical    length      type */
-       {IMX_IO_BASE, IMX_IO_PHYS, IMX_IO_SIZE, MT_DEVICE},
+       {
+               .virtual        = IMX_IO_BASE,
+               .pfn            = __phys_to_pfn(IMX_IO_PHYS),
+               .length         = IMX_IO_SIZE,
+               .type           = MT_DEVICE
+       }
 };
 
 void __init

diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c
index a7511dd..4cbdc1f 100644 (file)
--- a/arch/arm/mach-imx/mx1ads.c
+++ b/arch/arm/mach-imx/mx1ads.c
@@ -61,13 +61,37 @@ mx1ads_init(void)
 }
 
 static struct map_desc mx1ads_io_desc[] __initdata = {
-       /* virtual     physical    length      type */
-       {IMX_CS0_VIRT, IMX_CS0_PHYS, IMX_CS0_SIZE, MT_DEVICE},
-       {IMX_CS1_VIRT, IMX_CS1_PHYS, IMX_CS1_SIZE, MT_DEVICE},
-       {IMX_CS2_VIRT, IMX_CS2_PHYS, IMX_CS2_SIZE, MT_DEVICE},
-       {IMX_CS3_VIRT, IMX_CS3_PHYS, IMX_CS3_SIZE, MT_DEVICE},
-       {IMX_CS4_VIRT, IMX_CS4_PHYS, IMX_CS4_SIZE, MT_DEVICE},
-       {IMX_CS5_VIRT, IMX_CS5_PHYS, IMX_CS5_SIZE, MT_DEVICE},
+       {
+               .virtual        = IMX_CS0_VIRT,
+               .pfn            = __phys_to_pfn(IMX_CS0_PHYS),
+               .length         = IMX_CS0_SIZE,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IMX_CS1_VIRT,
+               .pfn            = __phys_to_pfn(IMX_CS1_PHYS),
+               .length         = IMX_CS1_SIZE,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IMX_CS2_VIRT,
+               .pfn            = __phys_to_pfn(IMX_CS2_PHYS),
+               .length         = IMX_CS2_SIZE,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IMX_CS3_VIRT,
+               .pfn            = __phys_to_pfn(IMX_CS3_PHYS),
+               .length         = IMX_CS3_SIZE,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IMX_CS4_VIRT,
+               .pfn            = __phys_to_pfn(IMX_CS4_PHYS),
+               .length         = IMX_CS4_SIZE,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IMX_CS5_VIRT,
+               .pfn            = __phys_to_pfn(IMX_CS5_PHYS),
+               .length         = IMX_CS5_SIZE,
+               .type           = MT_DEVICE
+       }
 };
 
 static void __init