ARM: imx: use MXxy_IO_P2V macros to setup static mappings

This makes less code rely on the virtual constants.

To further simplify code and reduce the needed boilerplate when
defining the static mappings a new helper macro is defined in
mach/hardware.h.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

1 files changed, 3 insertions, 18 deletions

diff --git a/arch/arm/mach-imx/mm-imx21.c b/arch/arm/mach-imx/mm-imx21.c
index 12faeeaa0a97..e728af81d1b1 100644
--- a/arch/arm/mach-imx/mm-imx21.c
+++ b/arch/arm/mach-imx/mm-imx21.c
@@ -35,33 +35,18 @@ static struct map_desc imx21_io_desc[] __initdata = {
          * - ROM Patch
          * - and some reserved space
          */
-        {
-                .virtual = MX21_AIPI_BASE_ADDR_VIRT,
-                .pfn = __phys_to_pfn(MX21_AIPI_BASE_ADDR),
-                .length = MX21_AIPI_SIZE,
-                .type = MT_DEVICE
-        },
+        imx_map_entry(MX21, AIPI, MT_DEVICE),
         /*
          * this fixed mapping covers:
          * - CSI
          * - ATA
          */
-        {
-                .virtual = MX21_SAHB1_BASE_ADDR_VIRT,
-                .pfn = __phys_to_pfn(MX21_SAHB1_BASE_ADDR),
-                .length = MX21_SAHB1_SIZE,
-                .type = MT_DEVICE
-        },
+        imx_map_entry(MX21, SAHB1, MT_DEVICE),
         /*
          * this fixed mapping covers:
          * - EMI
          */
-        {
-                .virtual = MX21_X_MEMC_BASE_ADDR_VIRT,
-                .pfn = __phys_to_pfn(MX21_X_MEMC_BASE_ADDR),
-                .length = MX21_X_MEMC_SIZE,
-                .type = MT_DEVICE
-        },
+        imx_map_entry(MX21, X_MEMC, MT_DEVICE),
 };
 
 /*