summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-07-07 12:31:36 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-08-17 09:44:16 +0200
commitd0a84e72eb755f58ba350d9988bfbdffd6f5a22c (patch)
tree1f54f10a238d128b7fafe2147d5acbffa5355d81
parentARM: io: s3c2410: remove ioaddr() (diff)
downloadlinux-d0a84e72eb755f58ba350d9988bfbdffd6f5a22c.tar.xz
linux-d0a84e72eb755f58ba350d9988bfbdffd6f5a22c.zip
ARM: io: RiscPC: define io addresses relative to IO_BASE
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-rpc/include/mach/hardware.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-rpc/include/mach/hardware.h b/arch/arm/mach-rpc/include/mach/hardware.h
index dde6b3c0e299..822b810215d7 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)