| Message ID | 20220828084341.112146-15-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | f4b632da13cf0ee39cdbd4ff08d1961ed50e3c14 |
| Headers | show |
| Series | arm64/dt-bindings: mfd: qcom: SPMI PMIC fixes | expand |
On Sun, 28 Aug 2022 11:43:41 +0300, Krzysztof Kozlowski wrote: > There are two bindings for Qualcomm SPMI PMIC Thermal Monitoring ADC: > one for ADC HC and one for ADC TM5 and TM7. PM8998 uses the former one, > so fix matching of child schema: > > qcom/msm8998-asus-novago-tp370ql.dtb: pmic@0: adc-tm@3400:compatible:0: 'qcom,spmi-adc-tm-hc' is not one of ['qcom,spmi-adc-tm5', 'qcom,spmi-adc-tm5-gen2', 'qcom,adc-tm7'] > > Fixes: 3f5117be9584 ("dt-bindings: mfd: convert to yaml Qualcomm SPMI PMIC") > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > .../bindings/mfd/qcom,spmi-pmic.yaml | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > Acked-by: Rob Herring <robh@kernel.org>
On Sun, 28 Aug 2022, Krzysztof Kozlowski wrote: > There are two bindings for Qualcomm SPMI PMIC Thermal Monitoring ADC: > one for ADC HC and one for ADC TM5 and TM7. PM8998 uses the former one, > so fix matching of child schema: > > qcom/msm8998-asus-novago-tp370ql.dtb: pmic@0: adc-tm@3400:compatible:0: 'qcom,spmi-adc-tm-hc' is not one of ['qcom,spmi-adc-tm5', 'qcom,spmi-adc-tm5-gen2', 'qcom,adc-tm7'] > > Fixes: 3f5117be9584 ("dt-bindings: mfd: convert to yaml Qualcomm SPMI PMIC") > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > .../bindings/mfd/qcom,spmi-pmic.yaml | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) Applied, thanks.
diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml index e062de7510ca..2946d08dd42f 100644 --- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml @@ -107,7 +107,7 @@ patternProperties: "^adc-tm@[0-9a-f]+$": type: object - $ref: /schemas/thermal/qcom-spmi-adc-tm5.yaml# + # ref depends on compatible, see allOf below "^audio-codec@[0-9a-f]+$": type: object @@ -150,6 +150,22 @@ required: - compatible - reg +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,pm8998 + then: + patternProperties: + "^adc-tm@[0-9a-f]+$": + $ref: /schemas/thermal/qcom-spmi-adc-tm-hc.yaml# + else: + patternProperties: + "^adc-tm@[0-9a-f]+$": + $ref: /schemas/thermal/qcom-spmi-adc-tm5.yaml# + additionalProperties: false examples:
There are two bindings for Qualcomm SPMI PMIC Thermal Monitoring ADC: one for ADC HC and one for ADC TM5 and TM7. PM8998 uses the former one, so fix matching of child schema: qcom/msm8998-asus-novago-tp370ql.dtb: pmic@0: adc-tm@3400:compatible:0: 'qcom,spmi-adc-tm-hc' is not one of ['qcom,spmi-adc-tm5', 'qcom,spmi-adc-tm5-gen2', 'qcom,adc-tm7'] Fixes: 3f5117be9584 ("dt-bindings: mfd: convert to yaml Qualcomm SPMI PMIC") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- .../bindings/mfd/qcom,spmi-pmic.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)