summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-06-15 16:16:05 +0100
committerMark Brown <broonie@kernel.org>2020-06-15 16:16:05 +0100
commit064e8af7159539fc2310870841e7f215b4f633e9 (patch)
tree2d714d837bf5c02e96a50ef232029e61ed715906 /Documentation/devicetree/bindings/spi
parentb3a9e3b9622ae10064826dccb4f7a52bd88c7407 (diff)
parent27784a256c2a453d891c0aaff84c3ac3f2e8a5a0 (diff)
downloadlinux-064e8af7159539fc2310870841e7f215b4f633e9.tar.bz2
Merge existing fixes from spi/for-5.8
Diffstat (limited to 'Documentation/devicetree/bindings/spi')
-rw-r--r--Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml26
1 files changed, 17 insertions, 9 deletions
diff --git a/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml b/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml
index 9147df29022a..38efb50081e3 100644
--- a/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml
+++ b/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml
@@ -34,12 +34,15 @@ properties:
maxItems: 1
clocks:
- maxItems: 1
+ minItems: 1
+ maxItems: 2
+ items:
+ - description: controller register bus clock
+ - description: baud rate generator and delay control clock
clock-names:
- description: input clock for the baud rate generator
- items:
- - const: core
+ minItems: 1
+ maxItems: 2
if:
properties:
@@ -51,17 +54,22 @@ if:
then:
properties:
clocks:
- contains:
- items:
- - description: controller register bus clock
- - description: baud rate generator and delay control clock
+ minItems: 2
clock-names:
- minItems: 2
items:
- const: core
- const: pclk
+else:
+ properties:
+ clocks:
+ maxItems: 1
+
+ clock-names:
+ items:
+ - const: core
+
required:
- compatible
- reg