summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/include/mach/mx21.h
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-10-25 11:40:30 +0200
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-17 08:58:08 +0100
commitf5d7a13b18706c3328c6aac3bf782a13cabf255a (patch)
treea8d10eb1e6eadb98557970fb1a5d47f992b0cd95 /arch/arm/plat-mxc/include/mach/mx21.h
parent9651b7db59893e796dfdd170485543b9863be9d8 (diff)
downloadblackbird-op-linux-f5d7a13b18706c3328c6aac3bf782a13cabf255a.tar.gz
blackbird-op-linux-f5d7a13b18706c3328c6aac3bf782a13cabf255a.zip
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>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/mx21.h')
-rw-r--r--arch/arm/plat-mxc/include/mach/mx21.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx21.h b/arch/arm/plat-mxc/include/mach/mx21.h
index 8bc59720b6e4..aed0277ebc93 100644
--- a/arch/arm/plat-mxc/include/mach/mx21.h
+++ b/arch/arm/plat-mxc/include/mach/mx21.h
@@ -92,10 +92,11 @@
#define MX21_IRAM_BASE_ADDR 0xffffe800 /* internal ram */
-#define MX21_IO_ADDRESS(x) ( \
- IMX_IO_ADDRESS(x, MX21_AIPI) ?: \
- IMX_IO_ADDRESS(x, MX21_SAHB1) ?: \
- IMX_IO_ADDRESS(x, MX21_X_MEMC))
+#define MX21_IO_P2V(x) ( \
+ IMX_IO_P2V_MODULE(x, MX21_AIPI) ?: \
+ IMX_IO_P2V_MODULE(x, MX21_SAHB1) ?: \
+ IMX_IO_P2V_MODULE(x, MX21_X_MEMC))
+#define MX21_IO_ADDRESS(x) IOMEM(MX21_IO_P2V(x))
/* fixed interrupt numbers */
#define MX21_INT_CSPI3 6
OpenPOWER on IntegriCloud