summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop13xx/include/mach/io.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-29 21:36:27 -0600
committerRob Herring <rob.herring@calxeda.com>2012-07-26 09:10:02 -0500
commit5b334eb2a9422f4658f353a550db10b8a6b691f9 (patch)
treeaa22fb56eb8475dbf58bf593ae704663ca343f5d /arch/arm/mach-iop13xx/include/mach/io.h
parent0a4b8c654615be5dd12d67e951446095bef8b565 (diff)
downloadlinux-5b334eb2a9422f4658f353a550db10b8a6b691f9.tar.bz2
iop13xx: use more regular PCI I/O space handling
iop13xx confuses I/O port numbers with physical addresses, which breaks legacy ISA I/O access behind PCI bridges and makes it unnecessarily hard to unify the inb/outb accessors with other platforms. This removes the special-casing and just puts all I/O ports into a single 128KB virtually mapped I/O port range starting at port zero. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-iop13xx/include/mach/io.h')
-rw-r--r--arch/arm/mach-iop13xx/include/mach/io.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-iop13xx/include/mach/io.h b/arch/arm/mach-iop13xx/include/mach/io.h
index f13188518025..e197cb8994ac 100644
--- a/arch/arm/mach-iop13xx/include/mach/io.h
+++ b/arch/arm/mach-iop13xx/include/mach/io.h
@@ -19,10 +19,10 @@
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
-#define IO_SPACE_LIMIT 0xffffffff
+#include <mach/iop13xx.h>
-#define __io(a) __iop13xx_io(a)
+#define IO_SPACE_LIMIT (IOP13XX_PCIE_IO_WINDOW_SIZE + IOP13XX_PCIX_IO_WINDOW_SIZE - 1)
-extern void __iomem * __iop13xx_io(unsigned long io_addr);
+#define __io(a) (IOP13XX_PCIX_LOWER_IO_VA + ((a) & IO_SPACE_LIMIT))
#endif