ARM: nomadik: 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: Alessandro Rubini <rubini@unipv.it>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: STEricsson <STEricsson_nomadik_linux@list.st.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-nomadik/include/mach/hardware.h b/arch/arm/mach-nomadik/include/mach/hardware.h
index 6316dba3bfc8f4e1ef3f8138a231238ba62e5e81..02035e459f500c320c5e2695e56996ce019a4601 100644 (file)
--- a/arch/arm/mach-nomadik/include/mach/hardware.h
+++ b/arch/arm/mach-nomadik/include/mach/hardware.h
@@ -30,7 +30,7 @@
                        - NOMADIK_IO_VIRTUAL + NOMADIK_IO_PHYSICAL)
 
 /* used in asm code, so no casts */
-#define IO_ADDRESS(x) ((x) - NOMADIK_IO_PHYSICAL + NOMADIK_IO_VIRTUAL)
+#define IO_ADDRESS(x) IOMEM((x) - NOMADIK_IO_PHYSICAL + NOMADIK_IO_VIRTUAL)
 
 /*
  *   Base address defination for Nomadik Onchip Logic Block

diff --git a/arch/arm/mach-nomadik/include/mach/uncompress.h b/arch/arm/mach-nomadik/include/mach/uncompress.h
index 071003bc84560559cea87b73ae6358beefde7cb0..7d4687e9cbdf4dbb17f5e9bef351889113c1aa1b 100644 (file)
--- a/arch/arm/mach-nomadik/include/mach/uncompress.h
+++ b/arch/arm/mach-nomadik/include/mach/uncompress.h
@@ -27,10 +27,10 @@
 struct amba_device;
 #include <linux/amba/serial.h>
 
-#define NOMADIK_UART_DR                0x101FB000
-#define NOMADIK_UART_LCRH      0x101FB02c
-#define NOMADIK_UART_CR                0x101FB030
-#define NOMADIK_UART_FR                0x101FB018
+#define NOMADIK_UART_DR                (void __iomem *)0x101FB000
+#define NOMADIK_UART_LCRH      (void __iomem *)0x101FB02c
+#define NOMADIK_UART_CR                (void __iomem *)0x101FB030
+#define NOMADIK_UART_FR                (void __iomem *)0x101FB018
 
 static void putc(const char c)
 {