Commit 2438a745 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/of' 

- Use PCI bus addresses (not CPU addresses) in 'ranges' properties when
  building dynamic DT nodes so systems where the PCI and CPU addresses
  space differ work correctly (Andrea della Porta)

* pci/of:
  PCI: of_property: Assign PCI instead of CPU bus address to dynamic PCI nodes
parents 5d756f3f 5e316d34

drivers/pci/of_property.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int of_pci_prop_ranges(struct pci_dev *pdev, struct of_changeset *ocs, 
		if (of_pci_get_addr_flags(&res[j], &flags))

			continue;



		val64 = res[j].start;

		val64 = pci_bus_address(pdev, &res[j] - pdev->resource);

		of_pci_set_address(pdev, rp[i].parent_addr, val64, 0, flags,

				   false);

		if (pci_is_bridge(pdev)) {