aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-armadillo800eva.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-09-14 16:08:08 -0400
committerArnd Bergmann <arnd@arndb.de>2012-09-18 04:15:11 -0400
commit0a4b04dc299dfb691827a4001b3d8d7e443b71c9 (patch)
tree8f8aaabd715306eac4a814cdfd73ef9059f16fea /arch/arm/mach-shmobile/board-armadillo800eva.c
parent4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (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/board-armadillo800eva.c')
-rw-r--r--arch/arm/mach-shmobile/board-armadillo800eva.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index cf10f92856d..2f32aa64c2b 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -135,7 +135,7 @@
135 * usbhsf_power_ctrl() 135 * usbhsf_power_ctrl()
136 */ 136 */
137#define IRQ7 evt2irq(0x02e0) 137#define IRQ7 evt2irq(0x02e0)
138#define USBCR1 0xe605810a 138#define USBCR1 IOMEM(0xe605810a)
139#define USBH 0xC6700000 139#define USBH 0xC6700000
140#define USBH_USBCTR 0x10834 140#define USBH_USBCTR 0x10834
141 141
@@ -949,8 +949,8 @@ clock_error:
949/* 949/*
950 * board init 950 * board init
951 */ 951 */
952#define GPIO_PORT7CR 0xe6050007 952#define GPIO_PORT7CR IOMEM(0xe6050007)
953#define GPIO_PORT8CR 0xe6050008 953#define GPIO_PORT8CR IOMEM(0xe6050008)
954static void __init eva_init(void) 954static void __init eva_init(void)
955{ 955{
956 struct platform_device *usb = NULL; 956 struct platform_device *usb = NULL;