Merge branch 'remotes/lorenzo/pci/bridge-emul'

- In an emulated PCI bridge, set Capability offsets so they match the
  hardware offsets shown by U-Boot (Pali Rohár)

* remotes/lorenzo/pci/bridge-emul:
  PCI: pci-bridge-emul: Set position of PCI capabilities to real HW value

diff --cc drivers/pci/controller/pci-aardvark.c
index 7cc51cfb8a13a070ffe63977ded76315b212465a,4834198cc86b797600c60154b269a22e940cf64a..ba36bbc5897d0023fcbb901ed08bba049602451f
--- 1/drivers/pci/controller/pci-aardvark.c
--- 2/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@@ -1078,9 -1077,8 +1078,10 @@@ static int advk_sw_pci_bridge_init(stru
        /* Indicates supports for Completion Retry Status */
        bridge->pcie_conf.rootcap = cpu_to_le16(PCI_EXP_RTCAP_CRSVIS);
  
 +      bridge->subsystem_vendor_id = advk_readl(pcie, PCIE_CORE_SSDEV_ID_REG) & 0xffff;
 +      bridge->subsystem_id = advk_readl(pcie, PCIE_CORE_SSDEV_ID_REG) >> 16;
        bridge->has_pcie = true;
+       bridge->pcie_start = PCIE_CORE_PCIEXP_CAP;
        bridge->data = pcie;
        bridge->ops = &advk_pci_bridge_emul_ops;