Skip to contentSkip to conversation

dt-bindings: Fix array constraints on scalar properties

PATCH Applied Rob Herring 6 participants 7 messages Apr 13, 2022 – Apr 14, 2022

Subsystems (11)
Device tree bindings Media (V4L/DVB) Arm Qualcomm mailing list SPI +7 more subsystems
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 dt-bindings: Fix array constraints on scalar properties

Scalar properties shouldn't have array constraints (minItems, maxItems, items). These constraints can simply be dropped with any constraints under 'items' moved up a level.

Cc Agathe Porte <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc Jean Delvare <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Olivier Moysan <[email protected]>
Cc Arnaud Pouliquen <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc Philipp Zabel <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Mathieu Poirier <[email protected]>
Cc Mark Brown <[email protected]>
Cc Fabrice Gasnier <[email protected]>
Cc Yunfei Dong <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Signed-off-by Rob Herring <[email protected]>
---
 Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml       | 5 ++---
 .../devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml      | 4 +---
 Documentation/devicetree/bindings/media/coda.yaml            | 1 -
 .../devicetree/bindings/media/mediatek,vcodec-decoder.yaml   | 2 --
 .../devicetree/bindings/media/mediatek,vcodec-encoder.yaml   | 2 --
 .../bindings/media/mediatek,vcodec-subdev-decoder.yaml       | 1 -
 .../devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 4 +---
 Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml  | 2 --
 8 files changed, 4 insertions(+), 17 deletions(-)
Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml +2 -3
index 801ca9ba7d34..e7493e25a7d2 100644
@@ -58,9 +58,8 @@ patternProperties:
           The value (two's complement) to be programmed in the channel specific N correction register.
           For remote channels only.
         $ref: /schemas/types.yaml#/definitions/int32
-        items:
-          minimum: -128
-          maximum: 127
+        minimum: -128
+        maximum: 127
 
     required:
       - reg
Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml +1 -3
index 7c260f209687..952bc900d0fa 100644
@@ -108,9 +108,7 @@ patternProperties:
           - [1-5]: order 1 to 5.
           For audio purpose it is recommended to use order 3 to 5.
         $ref: /schemas/types.yaml#/definitions/uint32
-        items:
-          minimum: 0
-          maximum: 5
+        maximum: 5
 
       "#io-channel-cells":
         const: 1
Documentation/devicetree/bindings/media/coda.yaml +0 -1
index 36781ee4617f..c9d5adbc8c4a 100644
@@ -65,7 +65,6 @@ properties:
   iram:
     $ref: /schemas/types.yaml#/definitions/phandle
     description: phandle pointing to the SRAM device node
-    maxItems: 1
 
 required:
   - compatible
Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml +0 -2
index 9b179bb44dfb..aa55ca65d6ed 100644
@@ -63,13 +63,11 @@ properties:
 
   mediatek,vpu:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description:
       Describes point to vpu.
 
   mediatek,scp:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description:
       Describes point to scp.
Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml +0 -2
index e7b65a91c92c..2746dea3ce79 100644
@@ -55,13 +55,11 @@ properties:
 
   mediatek,vpu:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description:
       Describes point to vpu.
 
   mediatek,scp:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description:
       Describes point to scp.
Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml +0 -1
index 7687be0f50aa..c73bf2352aca 100644
@@ -61,7 +61,6 @@ properties:
 
   mediatek,scp:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description: |
       The node of system control processor (SCP), using
       the remoteproc & rpmsg framework.
Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml +1 -3
index 2424de733ee4..d99a729d2710 100644
@@ -104,8 +104,7 @@ properties:
   qcom,smem-state-names:
     $ref: /schemas/types.yaml#/definitions/string
     description: The names of the state bits used for SMP2P output
-    items:
-      - const: stop
+    const: stop
 
   glink-edge:
     type: object

@@ -130,7 +129,6 @@ properties:
       qcom,remote-pid:
         $ref: /schemas/types.yaml#/definitions/uint32
         description: ID of the shared memory used by GLINK for communication with WPSS
-        maxItems: 1
 
     required:
       - interrupts
Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml +0 -2
index b104899205f6..5de710adfa63 100644
@@ -124,7 +124,6 @@ properties:
     description: |
       Override the default TX fifo size.  Unit is words.  Ignored if 0.
     $ref: /schemas/types.yaml#/definitions/uint32
-    maxItems: 1
     default: 64
 
   renesas,rx-fifo-size:

@@ -132,7 +131,6 @@ properties:
     description: |
       Override the default RX fifo size.  Unit is words.  Ignored if 0.
     $ref: /schemas/types.yaml#/definitions/uint32
-    maxItems: 1
     default: 64
 
 required:
Signature · 1 line
2.32.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Rob Herring

Scalar properties shouldn't have array constraints (minItems, maxItems, items). These constraints can simply be dropped with any constraints under 'items' moved up a level.

Signed-off-by Rob Herring <[email protected]>
 Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml  | 2 --
Reviewed-by Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Rob Herring
Quoted 27 lines · Rob Herring

Scalar properties shouldn't have array constraints (minItems, maxItems, items). These constraints can simply be dropped with any constraints under 'items' moved up a level.

Cc Agathe Porte <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc Jean Delvare <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Olivier Moysan <[email protected]>
Cc Arnaud Pouliquen <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc Philipp Zabel <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Mathieu Poirier <[email protected]>
Cc Mark Brown <[email protected]>
Cc Fabrice Gasnier <[email protected]>
Cc Yunfei Dong <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Signed-off-by Rob Herring <[email protected]>
Quoted 2 lines
---
 Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml       | 5 ++---
Acked-by Guenter Roeck <[email protected]>
Quoted 142 lines
 .../devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml      | 4 +---
 Documentation/devicetree/bindings/media/coda.yaml            | 1 -
 .../devicetree/bindings/media/mediatek,vcodec-decoder.yaml   | 2 --
 .../devicetree/bindings/media/mediatek,vcodec-encoder.yaml   | 2 --
 .../bindings/media/mediatek,vcodec-subdev-decoder.yaml       | 1 -
 .../devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 4 +---
 Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml  | 2 --
 8 files changed, 4 insertions(+), 17 deletions(-)
Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml +2 -3
index 801ca9ba7d34..e7493e25a7d2 100644
@@ -58,9 +58,8 @@ patternProperties:
           The value (two's complement) to be programmed in the channel specific N correction register.
           For remote channels only.
         $ref: /schemas/types.yaml#/definitions/int32
-        items:
-          minimum: -128
-          maximum: 127
+        minimum: -128
+        maximum: 127
 
     required:
       - reg
Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml +1 -3
index 7c260f209687..952bc900d0fa 100644
@@ -108,9 +108,7 @@ patternProperties:
           - [1-5]: order 1 to 5.
           For audio purpose it is recommended to use order 3 to 5.
         $ref: /schemas/types.yaml#/definitions/uint32
-        items:
-          minimum: 0
-          maximum: 5
+        maximum: 5
 
       "#io-channel-cells":
         const: 1
Documentation/devicetree/bindings/media/coda.yaml +0 -1
index 36781ee4617f..c9d5adbc8c4a 100644
@@ -65,7 +65,6 @@ properties:
   iram:
     $ref: /schemas/types.yaml#/definitions/phandle
     description: phandle pointing to the SRAM device node
-    maxItems: 1
 
 required:
   - compatible
Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml +0 -2
index 9b179bb44dfb..aa55ca65d6ed 100644
@@ -63,13 +63,11 @@ properties:
 
   mediatek,vpu:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description:
       Describes point to vpu.
 
   mediatek,scp:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description:
       Describes point to scp.
Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml +0 -2
index e7b65a91c92c..2746dea3ce79 100644
@@ -55,13 +55,11 @@ properties:
 
   mediatek,vpu:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description:
       Describes point to vpu.
 
   mediatek,scp:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description:
       Describes point to scp.
Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml +0 -1
index 7687be0f50aa..c73bf2352aca 100644
@@ -61,7 +61,6 @@ properties:
 
   mediatek,scp:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description: |
       The node of system control processor (SCP), using
       the remoteproc & rpmsg framework.
Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml +1 -3
index 2424de733ee4..d99a729d2710 100644
@@ -104,8 +104,7 @@ properties:
   qcom,smem-state-names:
     $ref: /schemas/types.yaml#/definitions/string
     description: The names of the state bits used for SMP2P output
-    items:
-      - const: stop
+    const: stop
 
   glink-edge:
     type: object

@@ -130,7 +129,6 @@ properties:
       qcom,remote-pid:
         $ref: /schemas/types.yaml#/definitions/uint32
         description: ID of the shared memory used by GLINK for communication with WPSS
-        maxItems: 1
 
     required:
       - interrupts
Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml +0 -2
index b104899205f6..5de710adfa63 100644
@@ -124,7 +124,6 @@ properties:
     description: |
       Override the default TX fifo size.  Unit is words.  Ignored if 0.
     $ref: /schemas/types.yaml#/definitions/uint32
-    maxItems: 1
     default: 64
 
   renesas,rx-fifo-size:

@@ -132,7 +131,6 @@ properties:
     description: |
       Override the default RX fifo size.  Unit is words.  Ignored if 0.
     $ref: /schemas/types.yaml#/definitions/uint32
-    maxItems: 1
     default: 64
 
 required:
maintainer Reviewed-by on v1 1/1
#3 lore raw
In reply to Rob Herring
Quoted 38 lines · Rob Herring

Scalar properties shouldn't have array constraints (minItems, maxItems, items). These constraints can simply be dropped with any constraints under 'items' moved up a level.

Cc Agathe Porte <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc Jean Delvare <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Olivier Moysan <[email protected]>
Cc Arnaud Pouliquen <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc Philipp Zabel <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Mathieu Poirier <[email protected]>
Cc Mark Brown <[email protected]>
Cc Fabrice Gasnier <[email protected]>
Cc Yunfei Dong <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Signed-off-by Rob Herring <[email protected]>

---

 Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml       | 5 ++---
 .../devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml      | 4 +---
 Documentation/devicetree/bindings/media/coda.yaml            | 1 -
 .../devicetree/bindings/media/mediatek,vcodec-decoder.yaml   | 2 --
 .../devicetree/bindings/media/mediatek,vcodec-encoder.yaml   | 2 --
 .../bindings/media/mediatek,vcodec-subdev-decoder.yaml       | 1 -
 .../devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 4 +---
 Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml  | 2 --
 8 files changed, 4 insertions(+), 17 deletions(-)

[...]

Quoted 9 lines
Documentation/devicetree/bindings/media/coda.yaml +0 -0
index 36781ee4617f..c9d5adbc8c4a 100644
@@ -65,7 +65,6 @@ properties:

   iram:
     $ref: /schemas/types.yaml#/definitions/phandle
     description: phandle pointing to the SRAM device node
- maxItems: 1

Reviewed-by Philipp Zabel <[email protected]>

regards
Philipp

Acked-by on v1 1/1
#5 lore raw
In reply to Rob Herring
Quoted 27 lines · On Wed, 13 Apr 2022 09:01:21 -0500 Rob Herring <[email protected]> wrote:

Scalar properties shouldn't have array constraints (minItems, maxItems, items). These constraints can simply be dropped with any constraints under 'items' moved up a level.

Cc Agathe Porte <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc Jean Delvare <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Olivier Moysan <[email protected]>
Cc Arnaud Pouliquen <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc Philipp Zabel <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Mathieu Poirier <[email protected]>
Cc Mark Brown <[email protected]>
Cc Fabrice Gasnier <[email protected]>
Cc Yunfei Dong <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Signed-off-by Rob Herring <[email protected]>
Quoted 3 lines
---
 Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml       | 5 ++---
 .../devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml      | 4 +---
Acked-by Jonathan Cameron <[email protected]>
Quoted 141 lines
 Documentation/devicetree/bindings/media/coda.yaml            | 1 -
 .../devicetree/bindings/media/mediatek,vcodec-decoder.yaml   | 2 --
 .../devicetree/bindings/media/mediatek,vcodec-encoder.yaml   | 2 --
 .../bindings/media/mediatek,vcodec-subdev-decoder.yaml       | 1 -
 .../devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 4 +---
 Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml  | 2 --
 8 files changed, 4 insertions(+), 17 deletions(-)
Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml +2 -3
index 801ca9ba7d34..e7493e25a7d2 100644
@@ -58,9 +58,8 @@ patternProperties:
           The value (two's complement) to be programmed in the channel specific N correction register.
           For remote channels only.
         $ref: /schemas/types.yaml#/definitions/int32
-        items:
-          minimum: -128
-          maximum: 127
+        minimum: -128
+        maximum: 127
 
     required:
       - reg
Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml +1 -3
index 7c260f209687..952bc900d0fa 100644
@@ -108,9 +108,7 @@ patternProperties:
           - [1-5]: order 1 to 5.
           For audio purpose it is recommended to use order 3 to 5.
         $ref: /schemas/types.yaml#/definitions/uint32
-        items:
-          minimum: 0
-          maximum: 5
+        maximum: 5
 
       "#io-channel-cells":
         const: 1
Documentation/devicetree/bindings/media/coda.yaml +0 -1
index 36781ee4617f..c9d5adbc8c4a 100644
@@ -65,7 +65,6 @@ properties:
   iram:
     $ref: /schemas/types.yaml#/definitions/phandle
     description: phandle pointing to the SRAM device node
-    maxItems: 1
 
 required:
   - compatible
Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml +0 -2
index 9b179bb44dfb..aa55ca65d6ed 100644
@@ -63,13 +63,11 @@ properties:
 
   mediatek,vpu:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description:
       Describes point to vpu.
 
   mediatek,scp:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description:
       Describes point to scp.
Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml +0 -2
index e7b65a91c92c..2746dea3ce79 100644
@@ -55,13 +55,11 @@ properties:
 
   mediatek,vpu:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description:
       Describes point to vpu.
 
   mediatek,scp:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description:
       Describes point to scp.
Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml +0 -1
index 7687be0f50aa..c73bf2352aca 100644
@@ -61,7 +61,6 @@ properties:
 
   mediatek,scp:
     $ref: /schemas/types.yaml#/definitions/phandle
-    maxItems: 1
     description: |
       The node of system control processor (SCP), using
       the remoteproc & rpmsg framework.
Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml +1 -3
index 2424de733ee4..d99a729d2710 100644
@@ -104,8 +104,7 @@ properties:
   qcom,smem-state-names:
     $ref: /schemas/types.yaml#/definitions/string
     description: The names of the state bits used for SMP2P output
-    items:
-      - const: stop
+    const: stop
 
   glink-edge:
     type: object

@@ -130,7 +129,6 @@ properties:
       qcom,remote-pid:
         $ref: /schemas/types.yaml#/definitions/uint32
         description: ID of the shared memory used by GLINK for communication with WPSS
-        maxItems: 1
 
     required:
       - interrupts
Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml +0 -2
index b104899205f6..5de710adfa63 100644
@@ -124,7 +124,6 @@ properties:
     description: |
       Override the default TX fifo size.  Unit is words.  Ignored if 0.
     $ref: /schemas/types.yaml#/definitions/uint32
-    maxItems: 1
     default: 64
 
   renesas,rx-fifo-size:

@@ -132,7 +131,6 @@ properties:
     description: |
       Override the default RX fifo size.  Unit is words.  Ignored if 0.
     $ref: /schemas/types.yaml#/definitions/uint32
-    maxItems: 1
     default: 64
 
 required:
author maintainer Applied
#6 lore raw
In reply to Rob Herring
Quoted 27 lines · Rob Herring

Scalar properties shouldn't have array constraints (minItems, maxItems, items). These constraints can simply be dropped with any constraints under 'items' moved up a level.

Cc Agathe Porte <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc Jean Delvare <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Olivier Moysan <[email protected]>
Cc Arnaud Pouliquen <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc Philipp Zabel <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Mathieu Poirier <[email protected]>
Cc Mark Brown <[email protected]>
Cc Fabrice Gasnier <[email protected]>
Cc Yunfei Dong <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Cc [email protected]
Signed-off-by Rob Herring <[email protected]>
Quoted 11 lines
---
 Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml       | 5 ++---
 .../devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml      | 4 +---
 Documentation/devicetree/bindings/media/coda.yaml            | 1 -
 .../devicetree/bindings/media/mediatek,vcodec-decoder.yaml   | 2 --
 .../devicetree/bindings/media/mediatek,vcodec-encoder.yaml   | 2 --
 .../bindings/media/mediatek,vcodec-subdev-decoder.yaml       | 1 -
 .../devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 4 +---
 Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml  | 2 --
 8 files changed, 4 insertions(+), 17 deletions(-)

Applied, thanks!