summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/include/mach
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-09-24 07:22:02 +0000
committerArnd Bergmann <arnd@arndb.de>2012-10-09 17:27:33 +0200
commit21c8715f0a1f4df8bfa2bd6f3915e5e33c1c2e6e (patch)
treec60c540c4799ad412161dd11090cee815926efe7 /arch/arm/mach-integrator/include/mach
parentc6e9fbbf4c9aa837c0d39a097f96aaf4f90dfef1 (diff)
downloadtalos-op-linux-21c8715f0a1f4df8bfa2bd6f3915e5e33c1c2e6e.tar.gz
talos-op-linux-21c8715f0a1f4df8bfa2bd6f3915e5e33c1c2e6e.zip
ARM: integrator: use __iomem pointers for MMIO, part 2
Due to some interesting merges in the integrator code, not all users of mmio pointers were converted before, this fixes all warnings that got introduced as a consequence. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/include/mach')
-rw-r--r--arch/arm/mach-integrator/include/mach/cm.h2
-rw-r--r--arch/arm/mach-integrator/include/mach/platform.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-integrator/include/mach/cm.h b/arch/arm/mach-integrator/include/mach/cm.h
index 1a78692e32a4..202e6a57f100 100644
--- a/arch/arm/mach-integrator/include/mach/cm.h
+++ b/arch/arm/mach-integrator/include/mach/cm.h
@@ -3,7 +3,7 @@
*/
void cm_control(u32, u32);
-#define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL)
+#define CM_CTRL __io_address(INTEGRATOR_HDR_CTRL)
#define CM_CTRL_LED (1 << 0)
#define CM_CTRL_nMBDET (1 << 1)
diff --git a/arch/arm/mach-integrator/include/mach/platform.h b/arch/arm/mach-integrator/include/mach/platform.h
index 4c0347526851..efeac5d0bc9e 100644
--- a/arch/arm/mach-integrator/include/mach/platform.h
+++ b/arch/arm/mach-integrator/include/mach/platform.h
@@ -324,9 +324,9 @@
*/
#define PHYS_PCI_V3_BASE 0x62000000
-#define PCI_MEMORY_VADDR 0xe8000000
-#define PCI_CONFIG_VADDR 0xec000000
-#define PCI_V3_VADDR 0xed000000
+#define PCI_MEMORY_VADDR IOMEM(0xe8000000)
+#define PCI_CONFIG_VADDR IOMEM(0xec000000)
+#define PCI_V3_VADDR IOMEM(0xed000000)
/* ------------------------------------------------------------------------
* Integrator Interrupt Controllers
OpenPOWER on IntegriCloud