| Message ID | 20200324180513.3882-2-robh@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 27f747b12313d0ec1823c68f0ff2a369d77ec2f0 |
| Headers | show |
| Series | [1/2] dt-bindings: thermal: tsens: Fix nvmem-cell-names schema | expand |
On Tue, Mar 24, 2020 at 11:35 PM Rob Herring <robh@kernel.org> wrote: > > Ensure the node only contains the properties listed in the schema by > setting 'additionalProperties: false'. Doing this requires reworking the > interrupt properties schemas so that they are defined in the main > 'properties' section. Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> > Fixes: a877e768f655 ("dt-bindings: thermal: tsens: Convert over to a yaml schema") > Cc: Andy Gross <agross@kernel.org> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > Cc: Amit Kucheria <amit.kucheria@linaro.org> > Cc: Zhang Rui <rui.zhang@intel.com> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: linux-arm-msm@vger.kernel.org > Cc: linux-pm@vger.kernel.org > Cc: devicetree@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> > --- > .../bindings/thermal/qcom-tsens.yaml | 28 ++++++++++++------- > 1 file changed, 18 insertions(+), 10 deletions(-) > > diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml > index 7a38d2116059..3492447e42e9 100644 > --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml > +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml > @@ -46,6 +46,18 @@ properties: > - description: TM registers > - description: SROT registers > > + interrupts: > + minItems: 1 > + items: > + - description: Combined interrupt if upper or lower threshold crossed > + - description: Interrupt if critical threshold crossed > + > + interrupt-names: > + minItems: 1 > + items: > + - const: uplow > + - const: critical > + > nvmem-cells: > minItems: 1 > maxItems: 2 > @@ -88,22 +100,16 @@ allOf: > then: > properties: > interrupts: > - items: > - - description: Combined interrupt if upper or lower threshold crossed > + maxItems: 1 > interrupt-names: > - items: > - - const: uplow > + maxItems: 1 > > else: > properties: > interrupts: > - items: > - - description: Combined interrupt if upper or lower threshold crossed > - - description: Interrupt if critical threshold crossed > + minItems: 2 > interrupt-names: > - items: > - - const: uplow > - - const: critical > + minItems: 2 > > required: > - compatible > @@ -113,6 +119,8 @@ required: > - interrupt-names > - "#thermal-sensor-cells" > > +additionalProperties: false > + > examples: > - | > #include <dt-bindings/interrupt-controller/arm-gic.h> > -- > 2.20.1 >
On Tue, 24 Mar 2020 12:05:13 -0600, Rob Herring wrote: > Ensure the node only contains the properties listed in the schema by > setting 'additionalProperties: false'. Doing this requires reworking the > interrupt properties schemas so that they are defined in the main > 'properties' section. > > Fixes: a877e768f655 ("dt-bindings: thermal: tsens: Convert over to a yaml schema") > Cc: Andy Gross <agross@kernel.org> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > Cc: Amit Kucheria <amit.kucheria@linaro.org> > Cc: Zhang Rui <rui.zhang@intel.com> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: linux-arm-msm@vger.kernel.org > Cc: linux-pm@vger.kernel.org > Cc: devicetree@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> > --- > .../bindings/thermal/qcom-tsens.yaml | 28 ++++++++++++------- > 1 file changed, 18 insertions(+), 10 deletions(-) > Applied, thanks. Rob
diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml index 7a38d2116059..3492447e42e9 100644 --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml @@ -46,6 +46,18 @@ properties: - description: TM registers - description: SROT registers + interrupts: + minItems: 1 + items: + - description: Combined interrupt if upper or lower threshold crossed + - description: Interrupt if critical threshold crossed + + interrupt-names: + minItems: 1 + items: + - const: uplow + - const: critical + nvmem-cells: minItems: 1 maxItems: 2 @@ -88,22 +100,16 @@ allOf: then: properties: interrupts: - items: - - description: Combined interrupt if upper or lower threshold crossed + maxItems: 1 interrupt-names: - items: - - const: uplow + maxItems: 1 else: properties: interrupts: - items: - - description: Combined interrupt if upper or lower threshold crossed - - description: Interrupt if critical threshold crossed + minItems: 2 interrupt-names: - items: - - const: uplow - - const: critical + minItems: 2 required: - compatible @@ -113,6 +119,8 @@ required: - interrupt-names - "#thermal-sensor-cells" +additionalProperties: false + examples: - | #include <dt-bindings/interrupt-controller/arm-gic.h>
Ensure the node only contains the properties listed in the schema by setting 'additionalProperties: false'. Doing this requires reworking the interrupt properties schemas so that they are defined in the main 'properties' section. Fixes: a877e768f655 ("dt-bindings: thermal: tsens: Convert over to a yaml schema") Cc: Andy Gross <agross@kernel.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Amit Kucheria <amit.kucheria@linaro.org> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: linux-arm-msm@vger.kernel.org Cc: linux-pm@vger.kernel.org Cc: devicetree@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> --- .../bindings/thermal/qcom-tsens.yaml | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-)