diff options
author | Rob Herring <robh@kernel.org> | 2022-04-19 14:55:12 +0200 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2022-04-19 14:55:12 +0200 |
commit | 2bd50abce1b6636bd3c9064e7ae5c0f832a615b2 (patch) | |
tree | 3e9047eacab5c5035400d7f9d66272221c2bfab4 /Documentation/devicetree/bindings/sound | |
parent | dt-bindings: soc: qcom,smp2p: convert to dtschema (diff) | |
parent | dt-bindings: display: panel-timing: Define a single type for properties (diff) | |
download | linux-2bd50abce1b6636bd3c9064e7ae5c0f832a615b2.tar.xz linux-2bd50abce1b6636bd3c9064e7ae5c0f832a615b2.zip |
Merge branch 'dt/linus' into dt/next
Pick up new meta-schema warning fixes.
Diffstat (limited to 'Documentation/devicetree/bindings/sound')
-rw-r--r-- | Documentation/devicetree/bindings/sound/st,stm32-sai.yaml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/sound/st,stm32-sai.yaml b/Documentation/devicetree/bindings/sound/st,stm32-sai.yaml index b3dbcba33e41..fe2e15504ebc 100644 --- a/Documentation/devicetree/bindings/sound/st,stm32-sai.yaml +++ b/Documentation/devicetree/bindings/sound/st,stm32-sai.yaml @@ -136,8 +136,7 @@ allOf: compatible: contains: const: st,stm32f4-sai - - - then: + then: properties: clocks: items: @@ -148,8 +147,7 @@ allOf: items: - const: x8k - const: x11k - - - else: + else: properties: clocks: items: |