On Sat, Dec 09, 2023 at 04:22:31PM -0300, Fabio Estevam wrote:
> Hi Conor,
>
> On Mon, Oct 2, 2023 at 9:27 AM Conor Dooley <conor@xxxxxxxxxx> wrote:
>
> > tbh, this seems like a situation where per compatible constraints should
> > be added, since each of the devices listed above has different
> > requirements.
>
> Ok, I am trying to add the device constraints as suggested.
>
> For example: I am trying to describe that imx93 has 7 items for fsl,tmu-range:
>
> --- 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
> + items:
> + - description: TTR0CR
> + - description: TTR1CR
> + - description: TTR2CR
> + - description: TTR3CR
> + - description: TTR4CR
> + - description: TTR5CR
> + - description: TTR6CR
> + minItems: 4
>
> fsl,tmu-calibration:
> $ref: /schemas/types.yaml#/definitions/uint32-matrix
> @@ -69,15 +78,33 @@ required:
> - fsl,tmu-calibration
> - '#thermal-sensor-cells'
>
> +
^^ extra newline here I think.
> +allOf:
> + - if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - fsl,imx93-tmu
> + then:
> + properties:
> + fsl,tmu-range:
> + minItems: 7
> + maxItems: 7
> + else:
> + properties:
> + fsl,tmu-range:
> + maxItems: 4
> +
> additionalProperties: false
>
> examples:
> - |
> tmu@f0000 {
> - compatible = "fsl,qoriq-tmu";
> + compatible = "fsl,imx93-tmu";
> reg = <0xf0000 0x1000>;
> interrupts = <18 2 0 0>;
> - fsl,tmu-range = <0x000a0000 0x00090026 0x0008004a 0x0001006a>;
> + fsl,tmu-range = <0x000a0000 0x00090026 0x0008004a 0x0001006a 0 0 0>;
> fsl,tmu-calibration = <0x00000000 0x00000025>,
> <0x00000001 0x00000028>,
> <0x00000002 0x0000002d>,
>
> but dt_binding_check fails:
>
> $ make dt_binding_check DT_SCHEMA_FILES=qoriq-thermal.yaml -j12
> 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
> /home/fabio/linux-next/Documentation/devicetree/bindings/thermal/qoriq-thermal.example.dtb:
> tmu@f0000: fsl,tmu-range: [[655360, 589862, 524362, 65642, 0, 0, 0]]
> is too short
> from schema $id: http://devicetree.org/schemas/thermal/qoriq-thermal.yaml#
>
> What is wrong with the yaml changes to tell that imx93 has 7 items for
> fsl,tmu-range?
You're adding the constraints and items at the wrong level AFAICT.
I think something like the below better matches your constraints?
diff --git a/Documentation/devicetree/bindings/thermal/qoriq-thermal.yaml b/Documentation/devicetree/bindings/thermal/qoriq-thermal.yaml
index 145744027234..540169806cc8 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,17 @@ 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
+ items:
+ items:
+ - description: TTR0CR
+ - description: TTR1CR
+ - description: TTR2CR
+ - description: TTR3CR
+ - description: TTR4CR
+ - description: TTR5CR
+ - description: TTR6CR
+ minItems: 4
+ maxItems: 1
fsl,tmu-calibration:
$ref: /schemas/types.yaml#/definitions/uint32-matrix
@@ -69,15 +80,34 @@ required:
- fsl,tmu-calibration
- '#thermal-sensor-cells'
+
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - fsl,imx93-tmu
+ then:
+ properties:
+ fsl,tmu-range:
+ items:
+ minItems: 7
+ else:
+ properties:
+ fsl,tmu-range:
+ items:
+ maxItems: 4
+
additionalProperties: false
examples:
- |
tmu@f0000 {
- compatible = "fsl,qoriq-tmu";
+ compatible = "fsl,imx93-tmu";
reg = <0xf0000 0x1000>;
interrupts = <18 2 0 0>;
- fsl,tmu-range = <0x000a0000 0x00090026 0x0008004a 0x0001006a>;
+ fsl,tmu-range = <0x000a0000 0x00090026 0x0008004a 0x0001006a 0 0 0>;
fsl,tmu-calibration = <0x00000000 0x00000025>,
<0x00000001 0x00000028>,
<0x00000002 0x0000002d>,
Attachment:
signature.asc
Description: PGP signature
