diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-17 03:07:50 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-17 03:07:50 +0300 |
| commit | a2c29ccd9477861b16ddc02c411a6c9665250558 (patch) | |
| tree | ffaf5c751208ebcc3ba55e416e22bcdcac86e019 /Documentation/devicetree/bindings/regulator/fixed-regulator.yaml | |
| parent | de6e93366828925b58e4a102b6590a8f4798b7e2 (diff) | |
| parent | 652980b1541c5a02e6410647c7daf840c06d724a (diff) | |
| download | linux-a2c29ccd9477861b16ddc02c411a6c9665250558.tar.xz | |
Merge tag 'devicetree-fixes-for-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring:
- Fix scalar property schemas with array constraints
- Fix 'enum' lists with duplicate entries
- Fix incomplete if/then/else schemas
- Add Renesas RZ/V2L SoC support to Mali Bifrost binding
- Maintainers update for Marvell irqchip
* tag 'devicetree-fixes-for-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dt-bindings: display: panel-timing: Define a single type for properties
dt-bindings: Fix array constraints on scalar properties
dt-bindings: gpu: mali-bifrost: Document RZ/V2L SoC
dt-bindings: net: snps: remove duplicate name
dt-bindings: Fix 'enum' lists with duplicate entries
dt-bindings: irqchip: mrvl,intc: refresh maintainers
dt-bindings: Fix incomplete if/then/else schemas
dt-bindings: power: renesas,apmu: Fix cpus property limits
dt-bindings: extcon: maxim,max77843: fix ports type
Diffstat (limited to 'Documentation/devicetree/bindings/regulator/fixed-regulator.yaml')
| -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: |