| Message ID | 20220413140121.3132837-1-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | 5a674d9dc9a097308e8f5848b8439e8a3eeac846 |
| Headers | show |
| Series | dt-bindings: Fix array constraints on scalar properties | expand |
On Wed, Apr 13, 2022 at 4:01 PM Rob Herring <robh@kernel.org> 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. > Signed-off-by: Rob Herring <robh@kernel.org> > Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml | 2 -- Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org 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
On Mi, 2022-04-13 at 09:01 -0500, Rob Herring 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 <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> > --- > 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(-) > [...] > diff --git a/Documentation/devicetree/bindings/media/coda.yaml b/Documentation/devicetree/bindings/media/coda.yaml > index 36781ee4617f..c9d5adbc8c4a 100644 > --- a/Documentation/devicetree/bindings/media/coda.yaml > +++ b/Documentation/devicetree/bindings/media/coda.yaml > @@ -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 <p.zabel@pengutronix.de> regards Philipp
On Wed, 13 Apr 2022 09:01:21 -0500 Rob Herring <robh@kernel.org> 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 <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> > --- > Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml | 5 ++--- > .../devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 4 +--- Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > 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(-) > > diff --git a/Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml b/Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml > index 801ca9ba7d34..e7493e25a7d2 100644 > --- a/Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml > +++ b/Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml > @@ -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 > diff --git a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml > index 7c260f209687..952bc900d0fa 100644 > --- a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml > +++ b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml > @@ -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 > diff --git a/Documentation/devicetree/bindings/media/coda.yaml b/Documentation/devicetree/bindings/media/coda.yaml > index 36781ee4617f..c9d5adbc8c4a 100644 > --- a/Documentation/devicetree/bindings/media/coda.yaml > +++ b/Documentation/devicetree/bindings/media/coda.yaml > @@ -65,7 +65,6 @@ properties: > iram: > $ref: /schemas/types.yaml#/definitions/phandle > description: phandle pointing to the SRAM device node > - maxItems: 1 > > required: > - compatible > diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml > index 9b179bb44dfb..aa55ca65d6ed 100644 > --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml > +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml > @@ -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. > > diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml > index e7b65a91c92c..2746dea3ce79 100644 > --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml > +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml > @@ -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. > > diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml > index 7687be0f50aa..c73bf2352aca 100644 > --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml > +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml > @@ -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. > diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml > index 2424de733ee4..d99a729d2710 100644 > --- a/Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml > +++ b/Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml > @@ -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 > diff --git a/Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml b/Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml > index b104899205f6..5de710adfa63 100644 > --- a/Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml > +++ b/Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml > @@ -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:
On Wed, 13 Apr 2022 09:01:21 -0500, Rob Herring 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 <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> > --- > 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!
diff --git a/Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml b/Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml index 801ca9ba7d34..e7493e25a7d2 100644 --- a/Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml +++ b/Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml @@ -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 diff --git a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml index 7c260f209687..952bc900d0fa 100644 --- a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml +++ b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml @@ -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 diff --git a/Documentation/devicetree/bindings/media/coda.yaml b/Documentation/devicetree/bindings/media/coda.yaml index 36781ee4617f..c9d5adbc8c4a 100644 --- a/Documentation/devicetree/bindings/media/coda.yaml +++ b/Documentation/devicetree/bindings/media/coda.yaml @@ -65,7 +65,6 @@ properties: iram: $ref: /schemas/types.yaml#/definitions/phandle description: phandle pointing to the SRAM device node - maxItems: 1 required: - compatible diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml index 9b179bb44dfb..aa55ca65d6ed 100644 --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml @@ -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. diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml index e7b65a91c92c..2746dea3ce79 100644 --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml @@ -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. diff --git a/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml b/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml index 7687be0f50aa..c73bf2352aca 100644 --- a/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml +++ b/Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml @@ -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. diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml index 2424de733ee4..d99a729d2710 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml @@ -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 diff --git a/Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml b/Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml index b104899205f6..5de710adfa63 100644 --- a/Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml +++ b/Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml @@ -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:
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> --- 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(-)