Browse Source

Merge branch 'pci/host-versatile' into next

* pci/host-versatile:
  PCI: versatile: Configure PCIe MPS settings
Bjorn Helgaas 8 years ago
parent
commit
f08bf55e69
1 changed files with 3 additions and 1 deletions
  1. 3 1
      drivers/pci/host/pci-versatile.c

+ 3 - 1
drivers/pci/host/pci-versatile.c

@@ -124,7 +124,7 @@ static int versatile_pci_probe(struct platform_device *pdev)
 	int ret, i, myslot = -1;
 	int ret, i, myslot = -1;
 	u32 val;
 	u32 val;
 	void __iomem *local_pci_cfg_base;
 	void __iomem *local_pci_cfg_base;
-	struct pci_bus *bus;
+	struct pci_bus *bus, *child;
 	LIST_HEAD(pci_res);
 	LIST_HEAD(pci_res);
 
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -204,6 +204,8 @@ static int versatile_pci_probe(struct platform_device *pdev)
 
 
 	pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
 	pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
 	pci_assign_unassigned_bus_resources(bus);
 	pci_assign_unassigned_bus_resources(bus);
+	list_for_each_entry(child, &bus->children, node)
+		pcie_bus_configure_settings(child);
 	pci_bus_add_devices(bus);
 	pci_bus_add_devices(bus);
 
 
 	return 0;
 	return 0;