diff options
| author | Mark Brown <broonie@kernel.org> | 2020-12-28 17:16:53 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-28 17:16:53 +0300 |
| commit | f81325a05e9317f09a2e4ec57a52e4e49eb42b54 (patch) | |
| tree | a5a91589c9ef8e212f2899f1462cfb5c3f0130ef /Documentation/devicetree/bindings/thermal/rcar-thermal.yaml | |
| parent | 671ee4db952449acde126965bf76817a3159040d (diff) | |
| parent | 5c8fe583cce542aa0b84adc939ce85293de36e5e (diff) | |
| download | linux-f81325a05e9317f09a2e4ec57a52e4e49eb42b54.tar.xz | |
Merge tag 'v5.11-rc1' into asoc-5.11
Linux 5.11-rc1
Diffstat (limited to 'Documentation/devicetree/bindings/thermal/rcar-thermal.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/thermal/rcar-thermal.yaml | 48 |
1 files changed, 29 insertions, 19 deletions
diff --git a/Documentation/devicetree/bindings/thermal/rcar-thermal.yaml b/Documentation/devicetree/bindings/thermal/rcar-thermal.yaml index 7e9557ac0e4a..927de79ab4b5 100644 --- a/Documentation/devicetree/bindings/thermal/rcar-thermal.yaml +++ b/Documentation/devicetree/bindings/thermal/rcar-thermal.yaml @@ -62,25 +62,35 @@ properties: "#thermal-sensor-cells": const: 0 -if: - properties: - compatible: - contains: - enum: - - renesas,thermal-r8a73a4 # R-Mobile APE6 - - renesas,thermal-r8a7779 # R-Car H1 -then: - required: - - compatible - - reg -else: - required: - - compatible - - reg - - interrupts - - clocks - - power-domains - - resets +required: + - compatible + - reg + +allOf: + - if: + not: + properties: + compatible: + contains: + enum: + - renesas,thermal-r8a73a4 # R-Mobile APE6 + - renesas,thermal-r8a7779 # R-Car H1 + then: + required: + - resets + - '#thermal-sensor-cells' + + - if: + not: + properties: + compatible: + contains: + const: renesas,thermal-r8a7779 # R-Car H1 + then: + required: + - interrupts + - clocks + - power-domains additionalProperties: false |