ARM: make mach/io.h include optional

Add a kconfig option NEED_MACH_IO_H to conditionally include mach/io.h.

Basing this on CONFIG_PCI and CONFIG_ISA doesn't quite work. Most ISA
platforms don't need mach/io.h, but ebsa110 does. Most PCI platforms need
mach/io.h for now, but ks8695 doesn't which means i/o accesses are broken.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Nicolas Pitre <nico@linaro.org>

2 files changed, 28 insertions, 0 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f2574fef1e41..31a2ddc2e480 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -217,6 +217,13 @@ config ARM_PATCH_PHYS_VIRT
           this feature (eg, building a kernel for a single machine) and
           you need to shrink the kernel to the minimal size.
 
+config NEED_MACH_IO_H
+        bool
+        help
+          Select this when mach/io.h is required to provide special
+          definitions for this platform.  The need for mach/io.h should
+          be avoided when possible.
+
 config NEED_MACH_MEMORY_H
         bool
         help
@@ -268,6 +275,7 @@ config ARCH_INTEGRATOR
         select GENERIC_CLOCKEVENTS
         select PLAT_VERSATILE
         select PLAT_VERSATILE_FPGA_IRQ
+        select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
         help
           Support for ARM's Integrator platform.
@@ -403,6 +411,7 @@ config ARCH_EBSA110
         select ISA
         select NO_IOPORT
         select ARCH_USES_GETTIMEOFFSET
+        select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
         help
           This is an evaluation board for the StrongARM processor available
@@ -429,6 +438,7 @@ config ARCH_FOOTBRIDGE
         select FOOTBRIDGE
         select GENERIC_CLOCKEVENTS
         select HAVE_IDE
+        select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
         help
           Support for systems based on the DC21285 companion chip
@@ -481,6 +491,7 @@ config ARCH_IOP13XX
         select PCI
         select ARCH_SUPPORTS_MSI
         select VMSPLIT_1G
+        select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
         select NEED_RET_TO_USER
         help
@@ -490,6 +501,7 @@ config ARCH_IOP32X
         bool "IOP32x-based"
         depends on MMU
         select CPU_XSCALE
+        select NEED_MACH_IO_H
         select NEED_RET_TO_USER
         select PLAT_IOP
         select PCI
@@ -502,6 +514,7 @@ config ARCH_IOP33X
         bool "IOP33x-based"
         depends on MMU
         select CPU_XSCALE
+        select NEED_MACH_IO_H
         select NEED_RET_TO_USER
         select PLAT_IOP
         select PCI
@@ -515,6 +528,7 @@ config ARCH_IXP23XX
         select CPU_XSC3
         select PCI
         select ARCH_USES_GETTIMEOFFSET
+        select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
         help
           Support for Intel's IXP23xx (XScale) family of processors.
@@ -525,6 +539,7 @@ config ARCH_IXP2000
         select CPU_XSCALE
         select PCI
         select ARCH_USES_GETTIMEOFFSET
+        select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
         help
           Support for Intel's IXP2400/2800 (XScale) family of processors.
@@ -538,6 +553,7 @@ config ARCH_IXP4XX
         select GENERIC_CLOCKEVENTS
         select HAVE_SCHED_CLOCK
         select MIGHT_HAVE_PCI
+        select NEED_MACH_IO_H
         select DMABOUNCE if PCI
         help
           Support for Intel's IXP4XX (XScale) family of processors.
@@ -548,6 +564,7 @@ config ARCH_DOVE
         select PCI
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_CLOCKEVENTS
+        select NEED_MACH_IO_H
         select PLAT_ORION
         help
           Support for the Marvell Dove SoC 88AP510
@@ -558,6 +575,7 @@ config ARCH_KIRKWOOD
         select PCI
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_CLOCKEVENTS
+        select NEED_MACH_IO_H
         select PLAT_ORION
         help
           Support for the following Marvell Kirkwood series SoCs:
@@ -582,6 +600,7 @@ config ARCH_MV78XX0
         select PCI
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_CLOCKEVENTS
+        select NEED_MACH_IO_H
         select PLAT_ORION
         help
           Support for the following Marvell MV78xx0 series SoCs:
@@ -651,6 +670,7 @@ config ARCH_TEGRA
         select HAVE_SCHED_CLOCK
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
+        select NEED_MACH_IO_H if PCI
         select ARCH_HAS_CPUFREQ
         help
           This enables support for NVIDIA Tegra based systems (Tegra APX,
@@ -745,6 +765,7 @@ config ARCH_RPC
         select ARCH_SPARSEMEM_ENABLE
         select ARCH_USES_GETTIMEOFFSET
         select HAVE_IDE
+        select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
         help
           On the Acorn Risc-PC, Linux can support the internal IDE disk and
@@ -777,6 +798,7 @@ config ARCH_S3C2410
         select CLKDEV_LOOKUP
         select ARCH_USES_GETTIMEOFFSET
         select HAVE_S3C2410_I2C if I2C
+        select NEED_MACH_IO_H
         help
           Samsung S3C2410X CPU based systems, such as the Simtec Electronics
           BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -883,6 +905,7 @@ config ARCH_SHARK
         select PCI
         select ARCH_USES_GETTIMEOFFSET
         select NEED_MACH_MEMORY_H
+        select NEED_MACH_IO_H
         help
           Support for the StrongARM based Digital DNARD machine, also known
           as "Shark" (<http://www.shark-linux.de/shark.html>).
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 6f7555ddab8c..233034e46ec6 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -114,7 +114,12 @@ static inline void __iomem *__typesafe_io(unsigned long addr)
 /*
  * Now, pick up the machine-defined IO definitions
  */
+#ifdef CONFIG_NEED_MACH_IO_H
 #include <mach/io.h>
+#else
+#define __io(a)         ({ (void)(a); __typesafe_io(0); })
+#define __mem_pci(a)    (a)
+#endif
 
 /*
  * This is the limit of PC card/PCI/ISA IO space, which is by default