diff options
| author | Rob Herring <robh@kernel.org> | 2022-04-19 07:55:12 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2022-04-19 07:55:12 -0500 |
| commit | 2bd50abce1b6636bd3c9064e7ae5c0f832a615b2 (patch) | |
| tree | 3e9047eacab5c5035400d7f9d66272221c2bfab4 /Documentation/devicetree/bindings/regulator | |
| parent | 548f8b21ae6053680c61fe7ca79e2380b0b3964e (diff) | |
| parent | 652980b1541c5a02e6410647c7daf840c06d724a (diff) | |
| download | linux-2bd50abce1b6636bd3c9064e7ae5c0f832a615b2.tar.gz linux-2bd50abce1b6636bd3c9064e7ae5c0f832a615b2.tar.bz2 linux-2bd50abce1b6636bd3c9064e7ae5c0f832a615b2.zip | |
Merge branch 'dt/linus' into dt/next
Pick up new meta-schema warning fixes.
Diffstat (limited to 'Documentation/devicetree/bindings/regulator')
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/fixed-regulator.yaml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Documentation/devicetree/bindings/regulator/fixed-regulator.yaml b/Documentation/devicetree/bindings/regulator/fixed-regulator.yaml index 9b131c6facbc..84eeaef179a5 100644 --- a/Documentation/devicetree/bindings/regulator/fixed-regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/fixed-regulator.yaml @@ -18,23 +18,23 @@ description: allOf: - $ref: "regulator.yaml#" - -if: - properties: - compatible: - contains: - const: regulator-fixed-clock - required: - - clocks -else: - if: - properties: - compatible: - contains: - const: regulator-fixed-domain - required: - - power-domains - - required-opps + - if: + properties: + compatible: + contains: + const: regulator-fixed-clock + then: + required: + - clocks + - if: + properties: + compatible: + contains: + const: regulator-fixed-domain + then: + required: + - power-domains + - required-opps properties: compatible: |