[POWERPC] Rewrite IO allocation & mapping on powerpc64

[deliverable/linux.git] / arch / powerpc / platforms / maple / pci.c

diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 7aaa5bbc93630e24986491e8b1717bfef5794d13..f357b9258875489e234c0f5bb8ece0e5a203e7df 100644 (file)
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -519,23 +519,6 @@ void __devinit maple_pci_irq_fixup(struct pci_dev *dev)
        DBG(" <- maple_pci_irq_fixup\n");
 }
 
-static void __init maple_fixup_phb_resources(void)
-{
-       struct pci_controller *hose, *tmp;
-       
-       list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-               unsigned long offset = (unsigned long)hose->io_base_virt - pci_io_base;
-
-               hose->io_resource.start += offset;
-               hose->io_resource.end += offset;
-
-               printk(KERN_INFO "PCI Host %d, io start: %llx; io end: %llx\n",
-                      hose->global_number,
-                      (unsigned long long)hose->io_resource.start,
-                      (unsigned long long)hose->io_resource.end);
-       }
-}
-
 void __init maple_pci_init(void)
 {
        struct device_node *np, *root;
@@ -573,24 +556,6 @@ void __init maple_pci_init(void)
        if (ht && add_bridge(ht) != 0)
                of_node_put(ht);
 
-        /*
-         * We need to call pci_setup_phb_io for the HT bridge first
-         * so it gets the I/O port numbers starting at 0, and we
-         * need to call it for the AGP bridge after that so it gets
-         * small positive I/O port numbers.
-         */
-        if (u3_ht)
-                pci_setup_phb_io(u3_ht, 1);
-        if (u3_agp)
-                pci_setup_phb_io(u3_agp, 0);
-        if (u4_pcie)
-                pci_setup_phb_io(u4_pcie, 0);
-
-       /* Fixup the IO resources on our host bridges as the common code
-        * does it only for childs of the host bridges
-        */
-       maple_fixup_phb_resources();
-
        /* Setup the linkage between OF nodes and PHBs */ 
        pci_devs_phb_init();