ARM: imx: refactor the io mapping macro

This makes it more assembler friendly and allows it to be used in situation
that need an unsigned long and not a pointer.  Also the naming is
clearer.  IOMEM is introduced without IMX_ prefix as it is used this way
in more than one ARM subarch and it might become globally available
soon.

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

1 files changed, 7 insertions, 6 deletions

diff --git a/arch/arm/plat-mxc/include/mach/mx35.h b/arch/arm/plat-mxc/include/mach/mx35.h
index 6267cff6035..ce1a24b0933 100644
--- a/arch/arm/plat-mxc/include/mach/mx35.h
+++ b/arch/arm/plat-mxc/include/mach/mx35.h
@@ -114,12 +114,13 @@
 #define MX35_NFC_BASE_ADDR              0xbb000000
 #define MX35_PCMCIA_MEM_BASE_ADDR       0xbc000000
 
-#define MX35_IO_ADDRESS(x) (                                            \
-        IMX_IO_ADDRESS(x, MX35_AIPS1) ?:                                \
-        IMX_IO_ADDRESS(x, MX35_AIPS2) ?:                                \
-        IMX_IO_ADDRESS(x, MX35_AVIC) ?:                                 \
-        IMX_IO_ADDRESS(x, MX35_X_MEMC) ?:                               \
-        IMX_IO_ADDRESS(x, MX35_SPBA0))
+#define MX35_IO_P2V(x)  (                                               \
+        IMX_IO_P2V_MODULE(x, MX35_AIPS1) ?:                             \
+        IMX_IO_P2V_MODULE(x, MX35_AIPS2) ?:                             \
+        IMX_IO_P2V_MODULE(x, MX35_AVIC) ?:                              \
+        IMX_IO_P2V_MODULE(x, MX35_X_MEMC) ?:                            \
+        IMX_IO_P2V_MODULE(x, MX35_SPBA0))
+#define MX35_IO_ADDRESS(x)              IOMEM(MX35_IO_P2V(x))
 
 /*
  * Interrupt numbers