[ARM] omap: Fix IO_ADDRESS() macros

OMAP1_IO_ADDRESS(), OMAP2_IO_ADDRESS() and IO_ADDRESS() returns cookies
for use with __raw_{read|write}* for accessing registers.  Therefore,
these macros should return (void __iomem *) cookies, not integer values.

Doing this improves typechecking, and means we can find those places
where, eg, DMA controllers are incorrectly given virtual addresses to
DMA to, or physical addresses are thrown through a virtual to physical
address translation.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

4 files changed, 35 insertions, 31 deletions

diff --git a/arch/arm/plat-omap/include/mach/control.h b/arch/arm/plat-omap/include/mach/control.h
index e3fd62d9a99..ee378d254cb 100644
--- a/arch/arm/plat-omap/include/mach/control.h
+++ b/arch/arm/plat-omap/include/mach/control.h
@@ -19,11 +19,11 @@
 #include <mach/io.h>
 
 #define OMAP242X_CTRL_REGADDR(reg)                                      \
-        (void __iomem *)IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
+        IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
 #define OMAP243X_CTRL_REGADDR(reg)                                      \
-        (void __iomem *)IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
+        IO_ADDRESS(OMAP243X_CTRL_BASE + (reg))
 #define OMAP343X_CTRL_REGADDR(reg)                                      \
-        (void __iomem *)IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
+        IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
 
 /*
  * As elsewhere, the "OMAP2_" prefix indicates that the macro is valid for
diff --git a/arch/arm/plat-omap/include/mach/io.h b/arch/arm/plat-omap/include/mach/io.h
index b9f57ce0ac1..dd0cf069431 100644
--- a/arch/arm/plat-omap/include/mach/io.h
+++ b/arch/arm/plat-omap/include/mach/io.h
@@ -55,14 +55,13 @@
 
 #if defined(CONFIG_ARCH_OMAP1)
 
-#define IO_PHYS         0xFFFB0000
-#define IO_OFFSET       0x01000000      /* Virtual IO = 0xfefb0000 */
-#define IO_SIZE         0x40000
-#define IO_VIRT         (IO_PHYS - IO_OFFSET)
-#define IO_ADDRESS(pa)  ((pa) - IO_OFFSET)
-#define OMAP1_IO_ADDRESS(pa)    ((pa) - IO_OFFSET)
-#define io_p2v(pa)      ((pa) - IO_OFFSET)
-#define io_v2p(va)      ((va) + IO_OFFSET)
+#define IO_PHYS                 0xFFFB0000
+#define IO_OFFSET               0x01000000      /* Virtual IO = 0xfefb0000 */
+#define IO_SIZE                 0x40000
+#define IO_VIRT                 (IO_PHYS - IO_OFFSET)
+#define __IO_ADDRESS(pa)        ((pa) - IO_OFFSET)
+#define __OMAP1_IO_ADDRESS(pa)  ((pa) - IO_OFFSET)
+#define io_v2p(va)              ((va) + IO_OFFSET)
 
 #elif defined(CONFIG_ARCH_OMAP2)
 
@@ -90,11 +89,10 @@
 
 #endif
 
-#define IO_OFFSET       0x90000000
-#define IO_ADDRESS(pa)  ((pa) + IO_OFFSET)      /* Works for L3 and L4 */
-#define OMAP2_IO_ADDRESS(pa)    ((pa) + IO_OFFSET)      /* Works for L3 and L4 */
-#define io_p2v(pa)      ((pa) + IO_OFFSET)      /* Works for L3 and L4 */
-#define io_v2p(va)      ((va) - IO_OFFSET)      /* Works for L3 and L4 */
+#define IO_OFFSET               0x90000000
+#define __IO_ADDRESS(pa)        ((pa) + IO_OFFSET)      /* Works for L3 and L4 */
+#define __OMAP2_IO_ADDRESS(pa)  ((pa) + IO_OFFSET)      /* Works for L3 and L4 */
+#define io_v2p(va)              ((va) - IO_OFFSET)      /* Works for L3 and L4 */
 
 /* DSP */
 #define DSP_MEM_24XX_PHYS       OMAP2420_DSP_MEM_BASE   /* 0x58000000 */
@@ -149,9 +147,8 @@
 
 
 #define IO_OFFSET               0x90000000
-#define IO_ADDRESS(pa)          ((pa) + IO_OFFSET)/* Works for L3 and L4 */
-#define OMAP2_IO_ADDRESS(pa)    ((pa) + IO_OFFSET)/* Works for L3 and L4 */
-#define io_p2v(pa)              ((pa) + IO_OFFSET)/* Works for L3 and L4 */
+#define __IO_ADDRESS(pa)        ((pa) + IO_OFFSET)/* Works for L3 and L4 */
+#define __OMAP2_IO_ADDRESS(pa)  ((pa) + IO_OFFSET)/* Works for L3 and L4 */
 #define io_v2p(va)              ((va) - IO_OFFSET)/* Works for L3 and L4 */
 
 /* DSP */
@@ -167,7 +164,14 @@
 
 #endif
 
-#ifndef __ASSEMBLER__
+#define IO_ADDRESS(pa)          IOMEM(__IO_ADDRESS(pa))
+#define OMAP1_IO_ADDRESS(pa)    IOMEM(__OMAP1_IO_ADDRESS(pa))
+#define OMAP2_IO_ADDRESS(pa)    IOMEM(__OMAP2_IO_ADDRESS(pa))
+
+#ifdef __ASSEMBLER__
+#define IOMEM(x)                x
+#else
+#define IOMEM(x)                ((void __force __iomem *)(x))
 
 /*
  * Functions to access the OMAP IO region
@@ -178,13 +182,13 @@
  *       - DO NOT use hardcoded virtual addresses to allow changing the
  *         IO address space again if needed
  */
-#define omap_readb(a)           (*(volatile unsigned char  *)IO_ADDRESS(a))
-#define omap_readw(a)           (*(volatile unsigned short *)IO_ADDRESS(a))
-#define omap_readl(a)           (*(volatile unsigned int   *)IO_ADDRESS(a))
+#define omap_readb(a)           __raw_readb(IO_ADDRESS(a))
+#define omap_readw(a)           __raw_readw(IO_ADDRESS(a))
+#define omap_readl(a)           __raw_readl(IO_ADDRESS(a))
 
-#define omap_writeb(v,a)        (*(volatile unsigned char  *)IO_ADDRESS(a) = (v))
-#define omap_writew(v,a)        (*(volatile unsigned short *)IO_ADDRESS(a) = (v))
-#define omap_writel(v,a)        (*(volatile unsigned int   *)IO_ADDRESS(a) = (v))
+#define omap_writeb(v,a)        __raw_writeb(v, IO_ADDRESS(a))
+#define omap_writew(v,a)        __raw_writew(v, IO_ADDRESS(a))
+#define omap_writel(v,a)        __raw_writel(v, IO_ADDRESS(a))
 
 extern void omap1_map_common_io(void);
 extern void omap1_init_common_hw(void);
diff --git a/arch/arm/plat-omap/include/mach/pm.h b/arch/arm/plat-omap/include/mach/pm.h
index bfa09325a5f..6063e9681de 100644
--- a/arch/arm/plat-omap/include/mach/pm.h
+++ b/arch/arm/plat-omap/include/mach/pm.h
@@ -39,11 +39,11 @@
  * Register and offset definitions to be used in PM assembler code
  * ----------------------------------------------------------------------------
  */
-#define CLKGEN_REG_ASM_BASE             io_p2v(0xfffece00)
+#define CLKGEN_REG_ASM_BASE             IO_ADDRESS(0xfffece00)
 #define ARM_IDLECT1_ASM_OFFSET          0x04
 #define ARM_IDLECT2_ASM_OFFSET          0x08
 
-#define TCMIF_ASM_BASE                  io_p2v(0xfffecc00)
+#define TCMIF_ASM_BASE                  IO_ADDRESS(0xfffecc00)
 #define EMIFS_CONFIG_ASM_OFFSET         0x0c
 #define EMIFF_SDRAM_CONFIG_ASM_OFFSET   0x20
 
diff --git a/arch/arm/plat-omap/include/mach/sdrc.h b/arch/arm/plat-omap/include/mach/sdrc.h
index 787b7acec54..d908eb527c8 100644
--- a/arch/arm/plat-omap/include/mach/sdrc.h
+++ b/arch/arm/plat-omap/include/mach/sdrc.h
@@ -63,9 +63,9 @@
  */
 
 
-#define OMAP242X_SMS_REGADDR(reg)       (void __iomem *)IO_ADDRESS(OMAP2420_SMS_BASE + reg)
-#define OMAP243X_SMS_REGADDR(reg)       (void __iomem *)IO_ADDRESS(OMAP243X_SMS_BASE + reg)
-#define OMAP343X_SMS_REGADDR(reg)       (void __iomem *)IO_ADDRESS(OMAP343X_SMS_BASE + reg)
+#define OMAP242X_SMS_REGADDR(reg)       IO_ADDRESS(OMAP2420_SMS_BASE + reg)
+#define OMAP243X_SMS_REGADDR(reg)       IO_ADDRESS(OMAP243X_SMS_BASE + reg)
+#define OMAP343X_SMS_REGADDR(reg)       IO_ADDRESS(OMAP343X_SMS_BASE + reg)
 
 /* SMS register offsets - read/write with sms_{read,write}_reg() */