From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 24 Feb 2021 20:59:24 +0000 (-0600)
Subject: Merge branch 'pci/rockchip'
X-Git-Tag: v5.12-rc1~37^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce96d1d7b8eaf5d21e2537826e86a33882638fb5;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/rockchip'

- Make 'ep-gpios' DT property optional (Chen-Yu Tsai)

- Add FriendlyARM NanoPi M4B to rockchip DT binding (Chen-Yu Tsai)

* pci/rockchip:
  dt-bindings: arm: rockchip: Add FriendlyARM NanoPi M4B
  PCI: rockchip: Make 'ep-gpios' DT property optional
---

ce96d1d7b8eaf5d21e2537826e86a33882638fb5