[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>

1 files changed, 2 insertions, 2 deletions

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