summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2021-02-24 23:59:24 +0300
committerBjorn Helgaas <bhelgaas@google.com>2021-02-24 23:59:24 +0300
commitce96d1d7b8eaf5d21e2537826e86a33882638fb5 (patch)
tree7f6058d2e477de6f1ba951d399b0e69d5d3545a0 /Documentation
parent4ab5718c3146114a54bbde3d5aafa19db66c2ea8 (diff)
parent8e61744de4d34162467b0b3e49aa9de8bf817180 (diff)
downloadlinux-ce96d1d7b8eaf5d21e2537826e86a33882638fb5.tar.xz
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/arm/rockchip.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index ef4544ad6f82..773fd4c531ed 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -132,6 +132,7 @@ properties:
- enum:
- friendlyarm,nanopc-t4
- friendlyarm,nanopi-m4
+ - friendlyarm,nanopi-m4b
- friendlyarm,nanopi-neo4
- const: rockchip,rk3399