summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2020-01-14 11:16:02 -0600
committerRob Herring <robh@kernel.org>2020-01-14 11:16:02 -0600
commitdb0d39aa7f92cc566b70913f40dbaacc8152a308 (patch)
tree45ddb1f70fd6e21b311cc7168d802a3b932682d1
parentb873c122fef06905f58399a07121a09bfcf4289d (diff)
parentdbce0b65046d1735d7054c54ec2387dba84ba258 (diff)
downloadlinux-db0d39aa7f92cc566b70913f40dbaacc8152a308.tar.bz2
Merge branch 'dt/linus' into dt/next
-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: