ARM: at91: remove NEED_MACH_IO_H

The mach/io.h header on at91 is used to support a nonstandard I/O space
window for the cf card driver. This changes the driver to use pci_ioremap_io
in order to have the standard location, and then removes the custom
mach/io.h.

[alexandre.belloni@free-electrons.com: Added PCI dependency]
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index bfb799c7b343..e7775a41ae5d 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -317,13 +317,14 @@ static int at91_cf_probe(struct platform_device *pdev)
         } else
                 cf->socket.pci_irq = nr_irqs + 1;
 
-        /* pcmcia layer only remaps "real" memory not iospace */
-        cf->socket.io_offset = (unsigned long) devm_ioremap(&pdev->dev,
-                                        cf->phys_baseaddr + CF_IO_PHYS, SZ_2K);
-        if (!cf->socket.io_offset) {
-                status = -ENXIO;
+        /*
+         * pcmcia layer only remaps "real" memory not iospace
+         * io_offset is set to 0x10000 to avoid the check in static_find_io().
+         * */
+        cf->socket.io_offset = 0x10000;
+        status = pci_ioremap_io(0x10000, cf->phys_baseaddr + CF_IO_PHYS);
+        if (status)
                 goto fail0a;
-        }
 
         /* reserve chip-select regions */
         if (!devm_request_mem_region(&pdev->dev, io->start, resource_size(io), "at91_cf")) {