Merge branch 'pci/controller/rockchip'
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 16 May 2024 23:14:13 +0000 (18:14 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 16 May 2024 23:14:13 +0000 (18:14 -0500)
commitf4036f64b581637121d2319923a788db3b0432ec
tree9ad9e6144af87f0232f7e197027286a9bd147ffe
parent102c69699b5b5d4aebfe8d15d5f91bde68dababd
parent2dba285caba53f309d6060fca911b43d63f41697
Merge branch 'pci/controller/rockchip'

- Configure endpoint BAR to be 64-bit if the PCI_BASE_ADDRESS_MEM_TYPE_64
  flag is set instead of depending on the new BAR value itself (Niklas
  Cassel)

- Set Subsystem Vendor ID correctly (Rick Wertenbroek)

* pci/controller/rockchip:
  PCI: rockchip-ep: Remove wrong mask on subsys_vendor_id
  PCI: rockchip-ep: Set a 64-bit BAR if requested
drivers/pci/controller/pcie-rockchip-ep.c