commit d0a84e72eb755f58ba350d9988bfbdffd6f5a22c
author Russell King <rmk+kernel@arm.linux.org.uk> Thu Jul 07 11:31:36 2011 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Aug 17 08:44:16 2011 +0100
tree 1f54f10a238d128b7fafe2147d5acbffa5355d81
parent fb1dddd73dfd35d4f8669c4b849ce33483950237

ARM: io: RiscPC: define io addresses relative to IO_BASE

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

arch/arm/mach-rpc/include/mach/hardware.h

diff --git a/arch/arm/mach-rpc/include/mach/hardware.h b/arch/arm/mach-rpc/include/mach/hardware.h
index dde6b3c..822b810 100644
--- a/arch/arm/mach-rpc/include/mach/hardware.h
+++ b/arch/arm/mach-rpc/include/mach/hardware.h
@@ -51,12 +51,12 @@
 /*
  * IO Addresses
  */
-#define VIDC_BASE		IOMEM(0xe0400000)
-#define EXPMASK_BASE		0xe0360000
-#define IOMD_BASE		IOMEM(0xe0200000)
-#define IOC_BASE		IOMEM(0xe0200000)
-#define PCIO_BASE		IOMEM(0xe0010000)
-#define FLOPPYDMA_BASE		IOMEM(0xe002a000)
+#define VIDC_BASE		(IO_BASE + 0x00400000)
+#define EXPMASK_BASE		(IO_BASE + 0x00360000)
+#define IOMD_BASE		(IO_BASE + 0x00200000)
+#define IOC_BASE		(IO_BASE + 0x00200000)
+#define FLOPPYDMA_BASE		(IO_BASE + 0x0002a000)
+#define PCIO_BASE		(IO_BASE + 0x00010000)
 
 #define vidc_writel(val)	__raw_writel(val, VIDC_BASE)