diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 16:16:39 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-19 09:11:54 -0400 |
commit | b7a3f8db07c1bca303dbf038f108dd84638bcd82 (patch) | |
tree | 8b17e960201ad2d76f4fb26be76ba4aa7487599a /arch/arm/mach-integrator/integrator_cp.c | |
parent | f25d696aed301a38f744d6e4f661e45736a12a1c (diff) |
ARM: integrator: 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 patch has a few small conflicts with stuff in linux-next, which
we have to sort out in arm-soc.
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_cp.c')
-rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 82d5c837cc74..3df5fc369361 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -59,7 +59,7 @@ | |||
59 | 59 | ||
60 | #define INTCP_ETH_SIZE 0x10 | 60 | #define INTCP_ETH_SIZE 0x10 |
61 | 61 | ||
62 | #define INTCP_VA_CTRL_BASE IO_ADDRESS(INTEGRATOR_CP_CTL_BASE) | 62 | #define INTCP_VA_CTRL_BASE __io_address(INTEGRATOR_CP_CTL_BASE) |
63 | #define INTCP_FLASHPROG 0x04 | 63 | #define INTCP_FLASHPROG 0x04 |
64 | #define CINTEGRATOR_FLASHPROG_FLVPPEN (1 << 0) | 64 | #define CINTEGRATOR_FLASHPROG_FLVPPEN (1 << 0) |
65 | #define CINTEGRATOR_FLASHPROG_FLWREN (1 << 1) | 65 | #define CINTEGRATOR_FLASHPROG_FLWREN (1 << 1) |
@@ -265,8 +265,8 @@ static struct platform_device *intcp_devs[] __initdata = { | |||
265 | */ | 265 | */ |
266 | static unsigned int mmc_status(struct device *dev) | 266 | static unsigned int mmc_status(struct device *dev) |
267 | { | 267 | { |
268 | unsigned int status = readl(IO_ADDRESS(0xca000000 + 4)); | 268 | unsigned int status = readl(__io_address(0xca000000 + 4)); |
269 | writel(8, IO_ADDRESS(INTEGRATOR_CP_CTL_BASE + 8)); | 269 | writel(8, __io_address(INTEGRATOR_CP_CTL_BASE + 8)); |
270 | 270 | ||
271 | return status & 8; | 271 | return status & 8; |
272 | } | 272 | } |