From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 16 May 2024 23:14:13 +0000 (-0500)
Subject: Merge branch 'pci/controller/rockchip'
X-Git-Tag: v6.10-rc1~76^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4036f64b581637121d2319923a788db3b0432ec;p=thirdparty%2Flinux.git

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
---

f4036f64b581637121d2319923a788db3b0432ec