From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 25 Nov 2024 19:40:59 +0000 (-0600)
Subject: Merge branch 'pci/controller/microchip'
X-Git-Tag: ceph-for-6.13-rc4~158^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7b5d234e69f708c63eecff78e6befab85149216c;p=ceph-client.git

Merge branch 'pci/controller/microchip'

- Add DT and driver support for using either of the two PolarFire Root
  Ports (Conor Dooley)

* pci/controller/microchip:
  PCI: microchip: Add support for using either Root Port 1 or 2
  dt-bindings: PCI: microchip,pcie-host: Add reg for Root Port 2
---

7b5d234e69f708c63eecff78e6befab85149216c