1 files changed, 4 insertions, 18 deletions

diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c
index e95bf84cc837..2f84f4094f13 100644
--- a/arch/arm/mach-versatile/pci.c
+++ b/arch/arm/mach-versatile/pci.c
@@ -169,13 +169,6 @@ static struct pci_ops pci_versatile_ops = {
         .write  = versatile_write_config,
 };
 
-static struct resource io_port = {
-        .name   = "PCI",
-        .start  = 0,
-        .end    = IO_SPACE_LIMIT,
-        .flags  = IORESOURCE_IO,
-};
-
 static struct resource io_mem = {
         .name   = "PCI I/O space",
         .start  = VERSATILE_PCI_MEM_BASE0,
@@ -207,12 +200,6 @@ static int __init pci_versatile_setup_resources(struct pci_sys_data *sys)
                        "memory region (%d)\n", ret);
                 goto out;
         }
-        ret = request_resource(&ioport_resource, &io_port);
-        if (ret) {
-                printk(KERN_ERR "PCI: unable to allocate I/O "
-                       "port region (%d)\n", ret);
-                goto out;
-        }
         ret = request_resource(&iomem_resource, &non_mem);
         if (ret) {
                 printk(KERN_ERR "PCI: unable to allocate non-prefetchable "
@@ -227,11 +214,9 @@ static int __init pci_versatile_setup_resources(struct pci_sys_data *sys)
         }
 
         /*
-         * the IO resource for this bus
          * the mem resource for this bus
          * the prefetch mem resource for this bus
          */
-        pci_add_resource_offset(&sys->resources, &io_port, sys->io_offset);
         pci_add_resource_offset(&sys->resources, &non_mem, sys->mem_offset);
         pci_add_resource_offset(&sys->resources, &pre_mem, sys->mem_offset);
 
@@ -260,9 +245,11 @@ int __init pci_versatile_setup(int nr, struct pci_sys_data *sys)
                 goto out;
         }
 
+        ret = pci_ioremap_io(0, VERSATILE_PCI_MEM_BASE0);
+        if (ret)
+                goto out;
+
         if (nr == 0) {
-                sys->mem_offset = 0;
-                sys->io_offset = 0;
                 ret = pci_versatile_setup_resources(sys);
                 if (ret < 0) {
                         printk("pci_versatile_setup: resources... oops?\n");
@@ -319,7 +306,6 @@ int __init pci_versatile_setup(int nr, struct pci_sys_data *sys)
 
 void __init pci_versatile_preinit(void)
 {
-        pcibios_min_io = 0x44000000;
         pcibios_min_mem = 0x50000000;
 
         __raw_writel(VERSATILE_PCI_MEM_BASE0 >> 28, PCI_IMAP0);