diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 20:14:01 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-19 15:11:53 +0200 |
| commit | f25d696aed301a38f744d6e4f661e45736a12a1c (patch) | |
| tree | 365255d4a475b2479200c314725d79efff0e9fb7 /arch/arm/mach-imx/mach-kzm_arm11_01.c | |
| parent | a21e5e282b7293ce1a192757ffe1baa71618961c (diff) | |
| download | blackbird-op-linux-f25d696aed301a38f744d6e4f661e45736a12a1c.tar.gz blackbird-op-linux-f25d696aed301a38f744d6e4f661e45736a12a1c.zip | |
ARM: imx: use __iomem pointers for MMIO
ARM is moving to stricter checks on readl/write functions,
so we need to use the correct types everywhere.
This found a bug in mach-armadillo5x0.c, where we attempt mmio
on the MXC_CCM_RCSR address that is currently defined to 0xc
and consequently causes an illegal address access.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/mach-kzm_arm11_01.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-kzm_arm11_01.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-kzm_arm11_01.c b/arch/arm/mach-imx/mach-kzm_arm11_01.c index 5d08533ab2c7..4b9b7aae7a9b 100644 --- a/arch/arm/mach-imx/mach-kzm_arm11_01.c +++ b/arch/arm/mach-imx/mach-kzm_arm11_01.c @@ -259,13 +259,13 @@ static void __init kzm_board_init(void) */ static struct map_desc kzm_io_desc[] __initdata = { { - .virtual = MX31_CS4_BASE_ADDR_VIRT, + .virtual = (unsigned long)MX31_CS4_BASE_ADDR_VIRT, .pfn = __phys_to_pfn(MX31_CS4_BASE_ADDR), .length = MX31_CS4_SIZE, .type = MT_DEVICE }, { - .virtual = MX31_CS5_BASE_ADDR_VIRT, + .virtual = (unsigned long)MX31_CS5_BASE_ADDR_VIRT, .pfn = __phys_to_pfn(MX31_CS5_BASE_ADDR), .length = MX31_CS5_SIZE, .type = MT_DEVICE |
