diff options
| author | Uwe Kleine-König | 2010-10-25 11:40:30 +0200 |
|---|---|---|
| committer | Uwe Kleine-König | 2010-11-17 08:58:08 +0100 |
| commit | f5d7a13b18706c3328c6aac3bf782a13cabf255a (patch) | |
| tree | a8d10eb1e6eadb98557970fb1a5d47f992b0cd95 /arch/arm/mach-mx3/mach-kzm_arm11_01.c | |
| parent | ARM: mx3: fix the last users of IMX_NEEDS_DEPRECATED_SYMBOLS (diff) | |
| download | kernel-qcow2-linux-f5d7a13b18706c3328c6aac3bf782a13cabf255a.tar.gz kernel-qcow2-linux-f5d7a13b18706c3328c6aac3bf782a13cabf255a.tar.xz kernel-qcow2-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/mach-mx3/mach-kzm_arm11_01.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-kzm_arm11_01.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mach-kzm_arm11_01.c b/arch/arm/mach-mx3/mach-kzm_arm11_01.c index 042cd5655e17..a5f3eb24e4d5 100644 --- a/arch/arm/mach-mx3/mach-kzm_arm11_01.c +++ b/arch/arm/mach-mx3/mach-kzm_arm11_01.c @@ -41,9 +41,9 @@ #include "devices-imx31.h" #include "devices.h" -#define KZM_ARM11_IO_ADDRESS(x) ( \ - IMX_IO_ADDRESS(x, MX31_CS4) ?: \ - IMX_IO_ADDRESS(x, MX31_CS5) ?: \ +#define KZM_ARM11_IO_ADDRESS(x) (IOMEM( \ + IMX_IO_P2V_MODULE(x, MX31_CS4) ?: \ + IMX_IO_P2V_MODULE(x, MX31_CS5)) ?: \ MX31_IO_ADDRESS(x)) /* |