Merge branch 'pci/rockchip'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 24 Feb 2021 20:59:24 +0000 (14:59 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 24 Feb 2021 20:59:24 +0000 (14:59 -0600)
commitce96d1d7b8eaf5d21e2537826e86a33882638fb5
tree7f6058d2e477de6f1ba951d399b0e69d5d3545a0
parent4ab5718c3146114a54bbde3d5aafa19db66c2ea8
parent8e61744de4d34162467b0b3e49aa9de8bf817180
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