Merge branch 'pci/rockchip'

Browse source

- 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

...

This commit is contained in:

Bjorn Helgaas 2021-02-24 14:59:24 -06:00

parent 4ab5718c31 8e61744de4

commit ce96d1d7b8

2 changed files with 7 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

Documentation/devicetree/bindings/arm/rockchip.yaml

View file

12

drivers/pci/controller/pcie-rockchip.c

View file