Skip to content

Commit 5a674d9

Browse files
committed
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 <agathe.porte@nokia.com> Cc: Guenter Roeck <linux@roeck-us.net> Cc: Jean Delvare <jdelvare@suse.com> Cc: Krzysztof Kozlowski <krzk+dt@kernel.org> Cc: Olivier Moysan <olivier.moysan@foss.st.com> Cc: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com> Cc: Jonathan Cameron <jic23@kernel.org> Cc: Lars-Peter Clausen <lars@metafoo.de> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mark Brown <broonie@kernel.org> Cc: Fabrice Gasnier <fabrice.gasnier@foss.st.com> Cc: Yunfei Dong <yunfei.dong@mediatek.com> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: linux-hwmon@vger.kernel.org Cc: alsa-devel@alsa-project.org Cc: linux-iio@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: linux-remoteproc@vger.kernel.org Cc: linux-spi@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Acked-by: Mark Brown <broonie@kernel.org> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20220413140121.3132837-1-robh@kernel.org
1 parent 5dc6ce7 commit 5a674d9

8 files changed

Lines changed: 4 additions & 17 deletions

File tree

Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ patternProperties:
5858
The value (two's complement) to be programmed in the channel specific N correction register.
5959
For remote channels only.
6060
$ref: /schemas/types.yaml#/definitions/int32
61-
items:
62-
minimum: -128
63-
maximum: 127
61+
minimum: -128
62+
maximum: 127
6463

6564
required:
6665
- reg

Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,7 @@ patternProperties:
108108
- [1-5]: order 1 to 5.
109109
For audio purpose it is recommended to use order 3 to 5.
110110
$ref: /schemas/types.yaml#/definitions/uint32
111-
items:
112-
minimum: 0
113-
maximum: 5
111+
maximum: 5
114112

115113
"#io-channel-cells":
116114
const: 1

Documentation/devicetree/bindings/media/coda.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ properties:
6565
iram:
6666
$ref: /schemas/types.yaml#/definitions/phandle
6767
description: phandle pointing to the SRAM device node
68-
maxItems: 1
6968

7069
required:
7170
- compatible

Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,11 @@ properties:
6363
6464
mediatek,vpu:
6565
$ref: /schemas/types.yaml#/definitions/phandle
66-
maxItems: 1
6766
description:
6867
Describes point to vpu.
6968

7069
mediatek,scp:
7170
$ref: /schemas/types.yaml#/definitions/phandle
72-
maxItems: 1
7371
description:
7472
Describes point to scp.
7573

Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,11 @@ properties:
5555
5656
mediatek,vpu:
5757
$ref: /schemas/types.yaml#/definitions/phandle
58-
maxItems: 1
5958
description:
6059
Describes point to vpu.
6160

6261
mediatek,scp:
6362
$ref: /schemas/types.yaml#/definitions/phandle
64-
maxItems: 1
6563
description:
6664
Describes point to scp.
6765

Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ properties:
6161
6262
mediatek,scp:
6363
$ref: /schemas/types.yaml#/definitions/phandle
64-
maxItems: 1
6564
description: |
6665
The node of system control processor (SCP), using
6766
the remoteproc & rpmsg framework.

Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ properties:
104104
qcom,smem-state-names:
105105
$ref: /schemas/types.yaml#/definitions/string
106106
description: The names of the state bits used for SMP2P output
107-
items:
108-
- const: stop
107+
const: stop
109108

110109
glink-edge:
111110
type: object
@@ -130,7 +129,6 @@ properties:
130129
qcom,remote-pid:
131130
$ref: /schemas/types.yaml#/definitions/uint32
132131
description: ID of the shared memory used by GLINK for communication with WPSS
133-
maxItems: 1
134132

135133
required:
136134
- interrupts

Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,13 @@ properties:
124124
description: |
125125
Override the default TX fifo size. Unit is words. Ignored if 0.
126126
$ref: /schemas/types.yaml#/definitions/uint32
127-
maxItems: 1
128127
default: 64
129128

130129
renesas,rx-fifo-size:
131130
# deprecated for soctype-specific bindings
132131
description: |
133132
Override the default RX fifo size. Unit is words. Ignored if 0.
134133
$ref: /schemas/types.yaml#/definitions/uint32
135-
maxItems: 1
136134
default: 64
137135

138136
required:

0 commit comments

Comments
 (0)