Sync io.h changes from mainline

This is to be in sync with Russell's patch 690b5a13b27ba3bb2c9d61c1f4018c5074b591e6.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/include/mach/io.h b/arch/arm/plat-omap/include/mach/io.h
index e6a1f28fa2ddbddf919811d73364835883713524..ea552674370600996cd501a48951134e2b1a9539 100644 (file)
--- a/arch/arm/plat-omap/include/mach/io.h
+++ b/arch/arm/plat-omap/include/mach/io.h
@@ -3,7 +3,7 @@
  *
  * IO definitions for TI OMAP processors and boards
  *
- * Copied from linux/include/asm-arm/arch-sa1100/io.h
+ * Copied from arch/arm/mach-sa1100/include/mach/io.h
  * Copyright (C) 1997-1999 Russell King
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -161,17 +161,14 @@
 
 #endif
 
-#ifdef __ASSEMBLER__
-
-#define IO_ADDRESS(pa)         __IO_ADDRESS(pa)
-#define OMAP1_IO_ADDRESS(pa)   __OMAP1_IO_ADDRESS(pa)
-#define OMAP2_IO_ADDRESS(pa)   __OMAP2_IO_ADDRESS(pa)
+#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 IO_ADDRESS(pa)         ((void __iomem *)__IO_ADDRESS(pa))
-#define OMAP1_IO_ADDRESS(pa)   ((void __iomem *)__OMAP1_IO_ADDRESS(pa))
-#define OMAP2_IO_ADDRESS(pa)   ((void __iomem *)__OMAP2_IO_ADDRESS(pa))
+#define IOMEM(x)               ((void __force __iomem *)(x))
 
 /*
  * Functions to access the OMAP IO region