Re: [PATCH v3] dt-bindings: thermal: qoriq-thermal: Adjust fsl,tmu-range min/maxItems

[Conor Dooley <conor@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 3952 bytes --]

On Sat, Dec 09, 2023 at 05:59:17PM -0300, Fabio Estevam wrote:
> Hi Conor,
> 
> On 09/12/2023 17:23, Conor Dooley wrote:
> 
> > You're adding the constraints and items at the wrong level AFAICT.
> > I think something like the below better matches your constraints?
> 
> Thanks for your example.
> 
> With your change the fsl,imx93-tmu case works correctly:
> if I pass the number of fsl,tmu-range entries different than 7,
> dt_binding_check correctly complains.
> 
> However, if I pass 7 entries to fsl,qoriq-tmu it should complain as it
> expects 4, but it

btw, unrelated - minItems seems (from a grep) like it needs to be 2 not
4.

> does not.
> 
> On top of your patch:
> 
> --- a/Documentation/devicetree/bindings/thermal/qoriq-thermal.yaml
> +++ b/Documentation/devicetree/bindings/thermal/qoriq-thermal.yaml
> @@ -104,7 +104,7 @@ additionalProperties: false
>  examples:
>    - |
>      tmu@f0000 {
> -        compatible = "fsl,imx93-tmu";
> +        compatible = "fsl,qoriq-tmu";
>          reg = <0xf0000 0x1000>;
>          interrupts = <18 2 0 0>;
>          fsl,tmu-range = <0x000a0000 0x00090026 0x0008004a 0x0001006a 0 0
> 0>;
> 
> make dt_binding_check DT_SCHEMA_FILES=qoriq-thermal.yaml
>   LINT    Documentation/devicetree/bindings
>   DTEX
> Documentation/devicetree/bindings/thermal/qoriq-thermal.example.dts
>   CHKDT   Documentation/devicetree/bindings/processed-schema.json
>   SCHEMA  Documentation/devicetree/bindings/processed-schema.json
>   DTC_CHK
> Documentation/devicetree/bindings/thermal/qoriq-thermal.example.dtb
> 
> Any suggestions?

I dunno. I spent far far longer than I would like to admit trying to fix
this. Firstly my suggestion here is crap I think and only applies to
___matrices___. I think it needs to be the way you had it in your diff,
but I cannot figure out why it doesn't apply the maxItems constraint.

Perhaps Rob or Krzysztof can figure out what we were overlooking.
The diff in question was something like:

diff --git a/Documentation/devicetree/bindings/thermal/qoriq-thermal.yaml b/Documentation/devicetree/bindings/thermal/qoriq-thermal.yaml
index 145744027234..50787938d605 100644
--- a/Documentation/devicetree/bindings/thermal/qoriq-thermal.yaml
+++ b/Documentation/devicetree/bindings/thermal/qoriq-thermal.yaml
@@ -21,6 +21,7 @@ properties:
     enum:
       - fsl,qoriq-tmu
       - fsl,imx8mq-tmu
+      - fsl,imx93-tmu
 
   reg:
     maxItems: 1
@@ -33,7 +34,15 @@ properties:
     description: |
       The values to be programmed into TTRnCR, as specified by the SoC
       reference manual. The first cell is TTR0CR, the second is TTR1CR, etc.
-    maxItems: 4
+    minItems: 2
+    items:
+      - description: TTR0CR
+      - description: TTR1CR
+      - description: TTR2CR
+      - description: TTR3CR
+      - description: TTR4CR
+      - description: TTR5CR
+      - description: TTR6CR
 
   fsl,tmu-calibration:
     $ref: /schemas/types.yaml#/definitions/uint32-matrix
@@ -69,15 +78,30 @@ required:
   - fsl,tmu-calibration
   - '#thermal-sensor-cells'
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: fsl,imx93-tmu
+    then:
+      properties:
+        fsl,tmu-range:
+          minItems: 7
+    else:
+      properties:
+        fsl,tmu-range:
+          maxItems: 4
+
 additionalProperties: false
 
 examples:
   - |
     tmu@f0000 {
-        compatible = "fsl,qoriq-tmu";
+        compatible = "fsl,imx8mq-tmu";
         reg = <0xf0000 0x1000>;
         interrupts = <18 2 0 0>;
-        fsl,tmu-range = <0x000a0000 0x00090026 0x0008004a 0x0001006a>;
+        fsl,tmu-range = <0x000a0000 0x00090026 0x0008004a 0x0001006a 0x0 0x0>;
         fsl,tmu-calibration = <0x00000000 0x00000025>,
                               <0x00000001 0x00000028>,
                               <0x00000002 0x0000002d>,


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]