ARM: iop3xx: use fixed PCI i/o mapping

Move iop33x and iop32x PCI to fixed i/o mapping and remove io.h. This
changes the PCI bus addresses from the cpu address to 0 based. It appears
that there is translation h/w for this, but its untested.

Not sure what to do with io_offset. I think it should always be 0.
AFAICT, PCI setup is skipped if the ATU is already setup.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>

6 files changed, 10 insertions, 72 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1b7faa5a085..58bb75efa63 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -495,7 +495,6 @@ 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
@@ -508,7 +507,6 @@ 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
diff --git a/arch/arm/include/asm/hardware/iop3xx.h b/arch/arm/include/asm/hardware/iop3xx.h
index 2ff2c75a463..02fe2fbe247 100644
--- a/arch/arm/include/asm/hardware/iop3xx.h
+++ b/arch/arm/include/asm/hardware/iop3xx.h
@@ -217,18 +217,8 @@ extern int iop3xx_get_init_atu(void);
 #define IOP3XX_PCI_LOWER_MEM_PA 0x80000000
 #define IOP3XX_PCI_MEM_WINDOW_SIZE      0x08000000
 
-#define IOP3XX_PCI_IO_WINDOW_SIZE       0x00010000
 #define IOP3XX_PCI_LOWER_IO_PA          0x90000000
-#define IOP3XX_PCI_LOWER_IO_VA          0xfe000000
-#define IOP3XX_PCI_LOWER_IO_BA          0x90000000
-#define IOP3XX_PCI_UPPER_IO_PA          (IOP3XX_PCI_LOWER_IO_PA +\
-                                        IOP3XX_PCI_IO_WINDOW_SIZE - 1)
-#define IOP3XX_PCI_UPPER_IO_VA          (IOP3XX_PCI_LOWER_IO_VA +\
-                                        IOP3XX_PCI_IO_WINDOW_SIZE - 1)
-#define IOP3XX_PCI_IO_PHYS_TO_VIRT(addr) (((u32) (addr) -\
-                                        IOP3XX_PCI_LOWER_IO_PA) +\
-                                        IOP3XX_PCI_LOWER_IO_VA)
-
+#define IOP3XX_PCI_LOWER_IO_BA          0x00000000
 
 #ifndef __ASSEMBLY__
 
diff --git a/arch/arm/mach-iop32x/include/mach/io.h b/arch/arm/mach-iop32x/include/mach/io.h
deleted file mode 100644
index e2ada265bb8..00000000000
--- a/arch/arm/mach-iop32x/include/mach/io.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * arch/arm/mach-iop32x/include/mach/io.h
- *
- * Copyright (C) 2001 MontaVista Software, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __IO_H
-#define __IO_H
-
-#include <asm/hardware/iop3xx.h>
-
-#define IO_SPACE_LIMIT          0xffffffff
-#define __io(p)         ((void __iomem *)IOP3XX_PCI_IO_PHYS_TO_VIRT(p))
-
-#endif
diff --git a/arch/arm/mach-iop33x/include/mach/io.h b/arch/arm/mach-iop33x/include/mach/io.h
deleted file mode 100644
index f7c1b659566..00000000000
--- a/arch/arm/mach-iop33x/include/mach/io.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * arch/arm/mach-iop33x/include/mach/io.h
- *
- * Copyright (C) 2001  MontaVista Software, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __IO_H
-#define __IO_H
-
-#include <asm/hardware/iop3xx.h>
-
-#define IO_SPACE_LIMIT          0xffffffff
-#define __io(p)         ((void __iomem *)IOP3XX_PCI_IO_PHYS_TO_VIRT(p))
-
-#endif
diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c
index 8daae9b230e..362474b5c40 100644
--- a/arch/arm/plat-iop/pci.c
+++ b/arch/arm/plat-iop/pci.c
@@ -192,30 +192,24 @@ int iop3xx_pci_setup(int nr, struct pci_sys_data *sys)
         if (nr != 0)
                 return 0;
 
-        res = kzalloc(2 * sizeof(struct resource), GFP_KERNEL);
+        res = kzalloc(sizeof(struct resource), GFP_KERNEL);
         if (!res)
                 panic("PCI: unable to alloc resources");
 
-        res[0].start = IOP3XX_PCI_LOWER_IO_PA;
-        res[0].end   = IOP3XX_PCI_LOWER_IO_PA + IOP3XX_PCI_IO_WINDOW_SIZE - 1;
-        res[0].name  = "IOP3XX PCI I/O Space";
-        res[0].flags = IORESOURCE_IO;
-        request_resource(&ioport_resource, &res[0]);
-
-        res[1].start = IOP3XX_PCI_LOWER_MEM_PA;
-        res[1].end   = IOP3XX_PCI_LOWER_MEM_PA + IOP3XX_PCI_MEM_WINDOW_SIZE - 1;
-        res[1].name  = "IOP3XX PCI Memory Space";
-        res[1].flags = IORESOURCE_MEM;
-        request_resource(&iomem_resource, &res[1]);
+        res->start = IOP3XX_PCI_LOWER_MEM_PA;
+        res->end   = IOP3XX_PCI_LOWER_MEM_PA + IOP3XX_PCI_MEM_WINDOW_SIZE - 1;
+        res->name  = "IOP3XX PCI Memory Space";
+        res->flags = IORESOURCE_MEM;
+        request_resource(&iomem_resource, res);
 
         /*
          * Use whatever translation is already setup.
          */
         sys->mem_offset = IOP3XX_PCI_LOWER_MEM_PA - *IOP3XX_OMWTVR0;
-        sys->io_offset  = IOP3XX_PCI_LOWER_IO_PA - *IOP3XX_OIOWTVR;
 
-        pci_add_resource_offset(&sys->resources, &res[0], sys->io_offset);
-        pci_add_resource_offset(&sys->resources, &res[1], sys->mem_offset);
+        pci_add_resource_offset(&sys->resources, res, sys->mem_offset);
+
+        pci_ioremap_io(0, IOP3XX_PCI_LOWER_IO_PA);
 
         return 1;
 }
@@ -367,7 +361,6 @@ void __init iop3xx_pci_preinit_cond(void)
 
 void __init iop3xx_pci_preinit(void)
 {
-        pcibios_min_io = 0;
         pcibios_min_mem = 0;
 
         iop3xx_atu_disable();
diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
index bade586fed0..5b217f460f1 100644
--- a/arch/arm/plat-iop/setup.c
+++ b/arch/arm/plat-iop/setup.c
@@ -25,11 +25,6 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
                 .pfn            = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
                 .length         = IOP3XX_PERIPHERAL_SIZE,
                 .type           = MT_UNCACHED,
-         }, {   /* PCI IO space */
-                .virtual        = IOP3XX_PCI_LOWER_IO_VA,
-                .pfn            = __phys_to_pfn(IOP3XX_PCI_LOWER_IO_PA),
-                .length         = IOP3XX_PCI_IO_WINDOW_SIZE,
-                .type           = MT_DEVICE,
          },
 };