summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-12-20 13:48:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-12-20 13:48:32 -0800
commitf1fd1610cbb6655883d1838ac79e53301596685d (patch)
tree7d93c290d121eb77e418186a6156b407a1cf9b84 /Documentation
parent3939f2c8665721eef8315f42d4c57fb1272aacd6 (diff)
parentdbce0b65046d1735d7054c54ec2387dba84ba258 (diff)
Merge tag 'devicetree-fixes-for-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull Devicetree fix from Rob Herring: "Add missing 'properties' keyword enclosing 'snps,tso' in snps,dwmac binding" * tag 'devicetree-fixes-for-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: Add missing 'properties' keyword enclosing 'snps,tso'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/net/snps,dwmac.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index 4845e29411e4..e08cd4c4d568 100644
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -347,6 +347,7 @@ allOf:
- st,spear600-gmac
then:
+ properties:
snps,tso:
$ref: /schemas/types.yaml#definitions/flag
description: