dt-bindings: thermal: tsens: Fix nvmem-cell-names schema
Rob Herring
maintainerPATCH 1/2 dt-bindings: thermal: tsens: Fix nvmem-cell-names schema
There's a typo 'nvmem-cells-names' in the schema which means the correct 'nvmem-cell-names' in the examples are not checked. The possible values are wrong too both in that the 2nd entry is not specified correctly and the values are just wrong based on the dts files in the kernel.
--- .../devicetree/bindings/thermal/qcom-tsens.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +4 -5
@@ -52,13 +52,12 @@ properties: description: Reference to an nvmem node for the calibration data - nvmem-cells-names: + nvmem-cell-names: minItems: 1 maxItems: 2 items: - - enum: - - caldata - - calsel + - const: calib + - const: calib_sel "#qcom,sensors": allOf:
@@ -124,7 +123,7 @@ examples: <0x4a8000 0x1000>; /* SROT */ nvmem-cells = <&tsens_caldata>, <&tsens_calsel>; - nvmem-cell-names = "caldata", "calsel"; + nvmem-cell-names = "calib", "calib_sel"; interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "uplow";
Signature · 1 line
2.20.1
Rob Herring
maintainerPATCH 2/2 dt-bindings: thermal: tsens: Set 'additionalProperties: false'
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.
--- .../bindings/thermal/qcom-tsens.yaml | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-)
Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +18 -10
@@ -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>
Signature · 1 line
2.20.1
Re: [PATCH 2/2] dt-bindings: thermal: tsens: Set 'additionalProperties: false'
Quoted 5 lines · Rob Herring
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.
Quoted 76 lines
Fixes a877e768f655 ("dt-bindings: thermal: tsens: Convert over to a yaml schema")Cc Andy Gross <[email protected]>Cc Bjorn Andersson <[email protected]>Cc Amit Kucheria <[email protected]>Cc Zhang Rui <[email protected]>Cc Daniel Lezcano <[email protected]>Signed-off-by Rob Herring <[email protected]>--- .../bindings/thermal/qcom-tsens.yaml | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-)Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +18
-11@@ -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
Re: [PATCH 2/2] dt-bindings: thermal: tsens: Set 'additionalProperties: false'
In reply to Rob HerringQuoted 15 lines · Rob Herring
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 <[email protected]>Cc Bjorn Andersson <[email protected]>Cc Amit Kucheria <[email protected]>Cc Zhang Rui <[email protected]>Cc Daniel Lezcano <[email protected]>Signed-off-by Rob Herring <[email protected]>
Quoted 4 lines
--- .../bindings/thermal/qcom-tsens.yaml | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-)
Applied, thanks.
Rob
Quoted 5 lines · Rob Herring
There's a typo 'nvmem-cells-names' in the schema which means the correct 'nvmem-cell-names' in the examples are not checked. The possible values are wrong too both in that the 2nd entry is not specified correctly and the values are just wrong based on the dts files in the kernel.
Quoted 47 lines
Fixes a877e768f655 ("dt-bindings: thermal: tsens: Convert over to a yaml schema")Cc Andy Gross <[email protected]>Cc Bjorn Andersson <[email protected]>Cc Amit Kucheria <[email protected]>Cc Zhang Rui <[email protected]>Cc Daniel Lezcano <[email protected]>Signed-off-by Rob Herring <[email protected]>--- .../devicetree/bindings/thermal/qcom-tsens.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +4
-6@@ -52,13 +52,12 @@ properties: description: Reference to an nvmem node for the calibration data - nvmem-cells-names: + nvmem-cell-names: minItems: 1 maxItems: 2 items: - - enum: - - caldata - - calsel + - const: calib + - const: calib_sel "#qcom,sensors": allOf:@@ -124,7 +123,7 @@ examples: <0x4a8000 0x1000>; /* SROT */ nvmem-cells = <&tsens_caldata>, <&tsens_calsel>; - nvmem-cell-names = "caldata", "calsel"; + nvmem-cell-names = "calib", "calib_sel"; interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "uplow"; --2.20.1
Quoted 15 lines · Rob Herring
There's a typo 'nvmem-cells-names' in the schema which means the correct 'nvmem-cell-names' in the examples are not checked. The possible values are wrong too both in that the 2nd entry is not specified correctly and the values are just wrong based on the dts files in the kernel.
Fixes a877e768f655 ("dt-bindings: thermal: tsens: Convert over to a yaml schema")Cc Andy Gross <[email protected]>Cc Bjorn Andersson <[email protected]>Cc Amit Kucheria <[email protected]>Cc Zhang Rui <[email protected]>Cc Daniel Lezcano <[email protected]>Signed-off-by Rob Herring <[email protected]>
Quoted 4 lines
--- .../devicetree/bindings/thermal/qcom-tsens.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
Applied, thanks.
Rob