tree 0b685f23958e371ef0b4eccfd72ef11be822d34e
parent af47f25f33f7f628cb50a82bc60b8ad1677626a2
parent 4035ff36a6e0a07a1f0b0609520e17bd69a74c8b
author Bjorn Helgaas <bhelgaas@google.com> 1569273018 -0500
committer Bjorn Helgaas <bhelgaas@google.com> 1569273018 -0500

Merge branch 'remotes/lorenzo/pci/dwc'

  - Make kirin_dw_pcie_ops constant (Nishka Dasgupta)

  - Make DesignWare "num-lanes" property optional and remove from relevant
    DTs (Hou Zhiqiang)

* remotes/lorenzo/pci/dwc:
  arm64: dts: fsl: Remove num-lanes property from PCIe nodes
  ARM: dts: ls1021a: Remove num-lanes property from PCIe nodes
  PCI: dwc: Return directly when num-lanes is not found
  dt-bindings: PCI: designware: Remove the num-lanes from Required properties
  PCI: kirin: Make structure kirin_dw_pcie_ops constant