powerpc: dart_iommu: optionally populate controller_ops on init

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / platforms / powermac / setup.c

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 713d36d45d1d8d1e6628dfd3b207479ef8532a62..71a353c07d0c7cfe2d2e439b093f7c4db5745ba5 100644 (file)
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -473,7 +473,7 @@ static void __init pmac_init_early(void)
        udbg_adb_init(!!strstr(boot_command_line, "btextdbg"));
 
 #ifdef CONFIG_PPC64
-       iommu_init_early_dart();
+       iommu_init_early_dart(NULL);
 #endif
 
        /* SMP Init has to be done early as we need to patch up
@@ -637,24 +637,6 @@ static int __init pmac_probe(void)
        return 1;
 }
 
-#ifdef CONFIG_PPC64
-/* Move that to pci.c */
-static int pmac_pci_probe_mode(struct pci_bus *bus)
-{
-       struct device_node *node = pci_bus_to_OF_node(bus);
-
-       /* We need to use normal PCI probing for the AGP bus,
-        * since the device for the AGP bridge isn't in the tree.
-        * Same for the PCIe host on U4 and the HT host bridge.
-        */
-       if (bus->self == NULL && (of_device_is_compatible(node, "u3-agp") ||
-                                 of_device_is_compatible(node, "u4-pcie") ||
-                                 of_device_is_compatible(node, "u3-ht")))
-               return PCI_PROBE_NORMAL;
-       return PCI_PROBE_DEVTREE;
-}
-#endif /* CONFIG_PPC64 */
-
 define_machine(powermac) {
        .name                   = "PowerMac",
        .probe                  = pmac_probe,