[POWERPC] Rewrite IO allocation & mapping on powerpc64

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

diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index c4af9e21ac9329532ca1bd7735fe336115576cf4..8302e34a3cbfc6c53a6cba1b046fcbc764d8bb85 100644 (file)
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -1006,19 +1006,6 @@ void __devinit pmac_pci_irq_fixup(struct pci_dev *dev)
 #endif /* CONFIG_PPC32 */
 }
 
-#ifdef CONFIG_PPC64
-static void __init pmac_fixup_phb_resources(void)
-{
-       struct pci_controller *hose, *tmp;
-
-       list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-               printk(KERN_INFO "PCI Host %d, io start: %lx; io end: %lx\n",
-                      hose->global_number,
-                      hose->io_resource.start, hose->io_resource.end);
-       }
-}
-#endif
-
 void __init pmac_pci_init(void)
 {
        struct device_node *np, *root;
@@ -1053,25 +1040,6 @@ void __init pmac_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);
-
-       /*
-        * On ppc64, fixup the IO resources on our host bridges as
-        * the common code does it only for children of the host bridges
-        */
-       pmac_fixup_phb_resources();
-
        /* Setup the linkage between OF nodes and PHBs */
        pci_devs_phb_init();