|
@@ -843,7 +843,6 @@ static int advk_pcie_probe(struct platform_device *pdev)
|
|
struct device *dev = &pdev->dev;
|
|
struct device *dev = &pdev->dev;
|
|
struct advk_pcie *pcie;
|
|
struct advk_pcie *pcie;
|
|
struct resource *res;
|
|
struct resource *res;
|
|
- struct pci_bus *bus, *child;
|
|
|
|
struct pci_host_bridge *bridge;
|
|
struct pci_host_bridge *bridge;
|
|
int ret, irq;
|
|
int ret, irq;
|
|
|
|
|
|
@@ -897,22 +896,13 @@ static int advk_pcie_probe(struct platform_device *pdev)
|
|
bridge->map_irq = of_irq_parse_and_map_pci;
|
|
bridge->map_irq = of_irq_parse_and_map_pci;
|
|
bridge->swizzle_irq = pci_common_swizzle;
|
|
bridge->swizzle_irq = pci_common_swizzle;
|
|
|
|
|
|
- ret = pci_scan_root_bus_bridge(bridge);
|
|
|
|
|
|
+ ret = pci_host_probe(bridge);
|
|
if (ret < 0) {
|
|
if (ret < 0) {
|
|
advk_pcie_remove_msi_irq_domain(pcie);
|
|
advk_pcie_remove_msi_irq_domain(pcie);
|
|
advk_pcie_remove_irq_domain(pcie);
|
|
advk_pcie_remove_irq_domain(pcie);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
- bus = bridge->bus;
|
|
|
|
-
|
|
|
|
- pci_bus_size_bridges(bus);
|
|
|
|
- pci_bus_assign_resources(bus);
|
|
|
|
-
|
|
|
|
- list_for_each_entry(child, &bus->children, node)
|
|
|
|
- pcie_bus_configure_settings(child);
|
|
|
|
-
|
|
|
|
- pci_bus_add_devices(bus);
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|