summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/setup.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-09-14 20:10:19 +0000
committerArnd Bergmann <arnd@arndb.de>2012-09-18 10:15:11 +0200
commitdca4ba4121a66bdd0d85d02df21aee2738edcf5a (patch)
tree4ea662dcdb71e2fee7113040a9d6f98a4c8725c2 /arch/arm/mach-at91/setup.c
parent0a4b04dc299dfb691827a4001b3d8d7e443b71c9 (diff)
downloadblackbird-op-linux-dca4ba4121a66bdd0d85d02df21aee2738edcf5a.tar.gz
blackbird-op-linux-dca4ba4121a66bdd0d85d02df21aee2738edcf5a.zip
ARM: at91: use __iomem pointers for MMIO
ARM is moving to stricter checks on readl/write functions, so we need to use the correct types everywhere. Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/setup.c')
-rw-r--r--arch/arm/mach-at91/setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index 944bffb08991..e6f52de1062f 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -73,7 +73,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
{
struct map_desc *desc = &sram_desc[bank];
- desc->virtual = AT91_IO_VIRT_BASE - length;
+ desc->virtual = (unsigned long)AT91_IO_VIRT_BASE - length;
if (bank > 0)
desc->virtual -= sram_desc[bank - 1].length;
@@ -88,7 +88,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
}
static struct map_desc at91_io_desc __initdata = {
- .virtual = AT91_VA_BASE_SYS,
+ .virtual = (unsigned long)AT91_VA_BASE_SYS,
.pfn = __phys_to_pfn(AT91_BASE_SYS),
.length = SZ_16K,
.type = MT_DEVICE,
OpenPOWER on IntegriCloud