diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 16:08:08 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-18 04:15:11 -0400 |
commit | 0a4b04dc299dfb691827a4001b3d8d7e443b71c9 (patch) | |
tree | 8f8aaabd715306eac4a814cdfd73ef9059f16fea /arch/arm/mach-shmobile/include/mach/gpio.h | |
parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) |
ARM: shmobile: 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 is a bit ugly for shmobile, which is the only platform
that just uses integer literals all over the place, but I can't
see a better way to do this.
Acked-by: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: linux-sh@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/gpio.h')
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/gpio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/gpio.h b/arch/arm/mach-shmobile/include/mach/gpio.h index 844507d937cb..90a92b2c1c52 100644 --- a/arch/arm/mach-shmobile/include/mach/gpio.h +++ b/arch/arm/mach-shmobile/include/mach/gpio.h | |||
@@ -35,12 +35,12 @@ static inline int irq_to_gpio(unsigned int irq) | |||
35 | * the method to control only pull up/down/free. | 35 | * the method to control only pull up/down/free. |
36 | * this function should be replaced by correct gpio function | 36 | * this function should be replaced by correct gpio function |
37 | */ | 37 | */ |
38 | static inline void __init gpio_direction_none(u32 addr) | 38 | static inline void __init gpio_direction_none(void __iomem * addr) |
39 | { | 39 | { |
40 | __raw_writeb(0x00, addr); | 40 | __raw_writeb(0x00, addr); |
41 | } | 41 | } |
42 | 42 | ||
43 | static inline void __init gpio_request_pullup(u32 addr) | 43 | static inline void __init gpio_request_pullup(void __iomem * addr) |
44 | { | 44 | { |
45 | u8 data = __raw_readb(addr); | 45 | u8 data = __raw_readb(addr); |
46 | 46 | ||
@@ -49,7 +49,7 @@ static inline void __init gpio_request_pullup(u32 addr) | |||
49 | __raw_writeb(data, addr); | 49 | __raw_writeb(data, addr); |
50 | } | 50 | } |
51 | 51 | ||
52 | static inline void __init gpio_request_pulldown(u32 addr) | 52 | static inline void __init gpio_request_pulldown(void __iomem * addr) |
53 | { | 53 | { |
54 | u8 data = __raw_readb(addr); | 54 | u8 data = __raw_readb(addr); |
55 | 55 | ||