iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dt-bindings: Drop redundant 'maxItems/minItems' in if/then schemas

Browse Source 
Another round of removing redundant minItems/maxItems when 'items' list is
specified. This time it is in if/then schemas as the meta-schema was
failing to check this case.

If a property has an 'items' list, then a 'minItems' or 'maxItems' with the
same size as the list is redundant and can be dropped. Note that is DT
schema specific behavior and not standard json-schema behavior. The tooling
will fixup the final schema adding any unspecified minItems/maxItems.

Signed-off-by: Rob Herring <robh@kernel.org>
Acked-By: Vinod Koul <vkoul@kernel.org>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> #for IIO
Link: https://lore.kernel.org/r/20220503162738.3827041-1-robh@kernel.org
This commit is contained in:
Rob Herring 2022-05-03 11:27:38 -05:00
parent b2b701b31e
commit caf83e494d
13 changed files with 5 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/clock/imx8m-clock.yaml
View File

@ -55,8 +55,6 @@ allOf:
then: then:
properties: properties:
clocks: clocks:
minItems: 7
maxItems: 7
items: items:
- description: 32k osc - description: 32k osc
- description: 25m osc - description: 25m osc
@ -66,8 +64,6 @@ allOf:
- description: ext3 clock input - description: ext3 clock input
- description: ext4 clock input - description: ext4 clock input
clock-names: clock-names:
minItems: 7
maxItems: 7
items: items:
- const: ckil - const: ckil
- const: osc_25m - const: osc_25m

4
Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
View File

@ -95,7 +95,6 @@ then:
properties: properties:
clocks: clocks:
minItems: 1 minItems: 1
maxItems: 4
items: items:
- description: Functional clock - description: Functional clock
- description: EXTAL input clock - description: EXTAL input clock
@ -104,7 +103,6 @@ then:
clock-names: clock-names:
minItems: 1 minItems: 1
maxItems: 4
items: items:
- const: fck - const: fck
# The LVDS encoder can use the EXTAL or DU_DOTCLKINx clocks. # The LVDS encoder can use the EXTAL or DU_DOTCLKINx clocks.
@ -128,12 +126,10 @@ then:
else: else:
properties: properties:
clocks: clocks:
maxItems: 1
items: items:
- description: Functional clock - description: Functional clock
clock-names: clock-names:
maxItems: 1
items: items:
- const: fck - const: fck

23
Documentation/devicetree/bindings/display/renesas,du.yaml
View File

@ -109,7 +109,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 1 minItems: 1
maxItems: 3
items: items:
- description: Functional clock - description: Functional clock
- description: DU_DOTCLKIN0 input clock - description: DU_DOTCLKIN0 input clock
@ -117,7 +116,6 @@ allOf:
clock-names: clock-names:
minItems: 1 minItems: 1
maxItems: 3
items: items:
- const: du.0 - const: du.0
- pattern: '^dclkin\.[01]$' - pattern: '^dclkin\.[01]$'
@ -159,7 +157,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
@ -168,7 +165,6 @@ allOf:
clock-names: clock-names:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
@ -216,7 +212,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
@ -225,7 +220,6 @@ allOf:
clock-names: clock-names:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
@ -271,7 +265,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
@ -280,7 +273,6 @@ allOf:
clock-names: clock-names:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
@ -327,7 +319,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
@ -336,7 +327,6 @@ allOf:
clock-names: clock-names:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
@ -386,7 +376,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 3 minItems: 3
maxItems: 6
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
@ -397,7 +386,6 @@ allOf:
clock-names: clock-names:
minItems: 3 minItems: 3
maxItems: 6
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
@ -448,7 +436,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 4 minItems: 4
maxItems: 8
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
@ -461,7 +448,6 @@ allOf:
clock-names: clock-names:
minItems: 4 minItems: 4
maxItems: 8
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
@ -525,7 +511,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 3 minItems: 3
maxItems: 6
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
@ -536,7 +521,6 @@ allOf:
clock-names: clock-names:
minItems: 3 minItems: 3
maxItems: 6
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
@ -596,7 +580,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 3 minItems: 3
maxItems: 6
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
@ -607,7 +590,6 @@ allOf:
clock-names: clock-names:
minItems: 3 minItems: 3
maxItems: 6
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
@ -666,14 +648,12 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 1 minItems: 1
maxItems: 2
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: DU_DOTCLKIN0 input clock - description: DU_DOTCLKIN0 input clock
clock-names: clock-names:
minItems: 1 minItems: 1
maxItems: 2
items: items:
- const: du.0 - const: du.0
- const: dclkin.0 - const: dclkin.0
@ -723,7 +703,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
@ -732,7 +711,6 @@ allOf:
clock-names: clock-names:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
@ -791,7 +769,6 @@ allOf:
- description: Functional clock - description: Functional clock
clock-names: clock-names:
maxItems: 1
items: items:
- const: du.0 - const: du.0

2
Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml
View File

@ -138,7 +138,6 @@ allOf:
- const: bus - const: bus
- const: adc - const: adc
minItems: 1 minItems: 1
maxItems: 2
interrupts: interrupts:
items: items:
@ -170,7 +169,6 @@ allOf:
- const: bus - const: bus
- const: adc - const: adc
minItems: 1 minItems: 1
maxItems: 2
interrupts: interrupts:
items: items:

7
Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml
View File

@ -202,22 +202,17 @@ allOf:
clocks: clocks:
items: items:
- description: module clock - description: module clock
minItems: 1
maxItems: 1
else: else:
properties: properties:
clocks: clocks:
items: items:
- description: module clock - description: module clock
- description: timeout clock - description: timeout clock
minItems: 2
maxItems: 2
clock-names: clock-names:
items: items:
- const: sdhci - const: sdhci
- const: tmclk - const: tmclk
minItems: 2
maxItems: 2
required: required:
- clock-names - clock-names

2
Documentation/devicetree/bindings/mtd/gpmi-nand.yaml
View File

@ -147,8 +147,6 @@ allOf:
- description: SoC gpmi io clock - description: SoC gpmi io clock
- description: SoC gpmi bch apb clock - description: SoC gpmi bch apb clock
clock-names: clock-names:
minItems: 2
maxItems: 2
items: items:
- const: gpmi_io - const: gpmi_io
- const: gpmi_bch_apb - const: gpmi_bch_apb

3
Documentation/devicetree/bindings/net/can/bosch,c_can.yaml
View File

@ -80,8 +80,6 @@ if:
then: then:
properties: properties:
interrupts: interrupts:
minItems: 4
maxItems: 4
items: items:
- description: Error and status IRQ - description: Error and status IRQ
- description: Message object IRQ - description: Message object IRQ
@ -91,7 +89,6 @@ then:
else: else:
properties: properties:
interrupts: interrupts:
maxItems: 1
items: items:
- description: Error and status IRQ - description: Error and status IRQ

10
Documentation/devicetree/bindings/phy/brcm,sata-phy.yaml
View File

@ -102,19 +102,17 @@ if:
then: then:
properties: properties:
reg: reg:
maxItems: 2 minItems: 2
reg-names: reg-names:
items: minItems: 2
- const: "phy"
- const: "phy-ctrl"
else: else:
properties: properties:
reg: reg:
maxItems: 1 maxItems: 1
reg-names: reg-names:
maxItems: 1 maxItems: 1
items:
- const: "phy"
required: required:
- compatible - compatible

10
Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml
View File

@ -71,7 +71,6 @@ allOf:
then: then:
properties: properties:
clock-output-names: clock-output-names:
minItems: 1
maxItems: 1 maxItems: 1
- if: - if:
@ -102,7 +101,6 @@ allOf:
properties: properties:
clock-output-names: clock-output-names:
minItems: 3 minItems: 3
maxItems: 3
- if: - if:
properties: properties:
@ -113,16 +111,12 @@ allOf:
then: then:
properties: properties:
clocks: clocks:
minItems: 3
maxItems: 3
items: items:
- description: Bus clock for register access - description: Bus clock for register access
- description: 24 MHz oscillator - description: 24 MHz oscillator
- description: 32 kHz clock from the CCU - description: 32 kHz clock from the CCU
clock-names: clock-names:
minItems: 3
maxItems: 3
items: items:
- const: bus - const: bus
- const: hosc - const: hosc
@ -142,7 +136,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 3 minItems: 3
maxItems: 4
items: items:
- description: Bus clock for register access - description: Bus clock for register access
- description: 24 MHz oscillator - description: 24 MHz oscillator
@ -151,7 +144,6 @@ allOf:
clock-names: clock-names:
minItems: 3 minItems: 3
maxItems: 4
items: items:
- const: bus - const: bus
- const: hosc - const: hosc
@ -174,14 +166,12 @@ allOf:
then: then:
properties: properties:
interrupts: interrupts:
minItems: 1
maxItems: 1 maxItems: 1
else: else:
properties: properties:
interrupts: interrupts:
minItems: 2 minItems: 2
maxItems: 2
required: required:
- "#clock-cells" - "#clock-cells"

4
Documentation/devicetree/bindings/serial/samsung_uart.yaml
View File

@ -100,7 +100,6 @@ allOf:
maxItems: 3 maxItems: 3
clock-names: clock-names:
minItems: 2 minItems: 2
maxItems: 3
items: items:
- const: uart - const: uart
- pattern: '^clk_uart_baud[0-1]$' - pattern: '^clk_uart_baud[0-1]$'
@ -118,11 +117,8 @@ allOf:
then: then:
properties: properties:
clocks: clocks:
minItems: 2
maxItems: 2 maxItems: 2
clock-names: clock-names:
minItems: 2
maxItems: 2
items: items:
- const: uart - const: uart
- const: clk_uart_baud0 - const: clk_uart_baud0

1
Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml
View File

@ -89,7 +89,6 @@ allOf:
properties: properties:
dmas: dmas:
minItems: 1 minItems: 1
maxItems: 2
items: items:
- description: RX DMA Channel - description: RX DMA Channel
- description: TX DMA Channel - description: TX DMA Channel

2
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml
View File

@ -80,7 +80,6 @@ allOf:
then: then:
properties: properties:
clocks: clocks:
minItems: 6
items: items:
- description: AUXCLK clock for McASP used by CPB audio - description: AUXCLK clock for McASP used by CPB audio
- description: Parent for CPB_McASP auxclk (for 48KHz) - description: Parent for CPB_McASP auxclk (for 48KHz)
@ -107,7 +106,6 @@ allOf:
then: then:
properties: properties:
clocks: clocks:
maxItems: 4
items: items:
- description: AUXCLK clock for McASP used by CPB audio - description: AUXCLK clock for McASP used by CPB audio
- description: Parent for CPB_McASP auxclk (for 48KHz) - description: Parent for CPB_McASP auxclk (for 48KHz)

1
Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.yaml
View File

@ -67,7 +67,6 @@ then:
properties: properties:
reg: reg:
minItems: 2 minItems: 2
maxItems: 3
items: items:
- description: TSC1 registers - description: TSC1 registers
- description: TSC2 registers - description: TSC2 registers