ARM: imx: refactor the io mapping macro

[deliverable/linux.git] / arch / arm / plat-mxc / include / mach / mx35.h

diff --git a/arch/arm/plat-mxc/include/mach/mx35.h b/arch/arm/plat-mxc/include/mach/mx35.h
index 6267cff6035d56532054e6d0503a8ad32ff77047..ce1a24b09337f071da984d3a1bee8c04f39f6d87 100644 (file)
--- 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