Skip to content

Commit e891726

Browse files
committed
dt-bindings: More dropping redundant minItems/maxItems
Another round of removing redundant minItems/maxItems from new schema in the recent merge window. 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. This condition is partially checked with the meta-schema already, but only if both 'minItems' and 'maxItems' are equal to the 'items' length. An improved meta-schema is pending. Cc: Stephen Boyd <sboyd@kernel.org> Cc: Joerg Roedel <joro@8bytes.org> Cc: Will Deacon <will@kernel.org> Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Cc: Miquel Raynal <miquel.raynal@bootlin.com> Cc: Richard Weinberger <richard@nod.at> Cc: Vignesh Raghavendra <vigneshr@ti.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com> Cc: Brian Norris <computersforpeace@gmail.com> Cc: Kamal Dasu <kdasu.kdev@gmail.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Sebastian Siewior <bigeasy@linutronix.de> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: linux-clk@vger.kernel.org Cc: iommu@lists.linux-foundation.org Cc: linux-mtd@lists.infradead.org Cc: linux-rtc@vger.kernel.org Cc: linux-usb@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Link: https://lore.kernel.org/r/20210713193453.690290-1-robh@kernel.org
1 parent d549c66 commit e891726

6 files changed

Lines changed: 0 additions & 15 deletions

File tree

Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ properties:
5050

5151
reg:
5252
minItems: 1
53-
maxItems: 3
5453
items:
5554
- description: base register
5655
- description: power register

Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@ properties:
2828
- description: configuration registers for MMU instance 0
2929
- description: configuration registers for MMU instance 1
3030
minItems: 1
31-
maxItems: 2
3231

3332
interrupts:
3433
items:
3534
- description: interruption for MMU instance 0
3635
- description: interruption for MMU instance 1
3736
minItems: 1
38-
maxItems: 2
3937

4038
clocks:
4139
items:

Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ properties:
5757

5858
ranges:
5959
minItems: 1
60-
maxItems: 3
6160
description: |
6261
Memory bus areas for interacting with the devices. Reflects
6362
the memory layout with four integer values following:

Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,13 @@ properties:
8484

8585
interrupts:
8686
minItems: 1
87-
maxItems: 3
8887
items:
8988
- description: NAND CTLRDY interrupt
9089
- description: FLASH_DMA_DONE if flash DMA is available
9190
- description: FLASH_EDU_DONE if EDU is available
9291

9392
interrupt-names:
9493
minItems: 1
95-
maxItems: 3
9694
items:
9795
- const: nand_ctlrdy
9896
- const: flash_dma_done
@@ -148,8 +146,6 @@ allOf:
148146
then:
149147
properties:
150148
reg-names:
151-
minItems: 2
152-
maxItems: 2
153149
items:
154150
- const: nand
155151
- const: nand-int-base
@@ -161,8 +157,6 @@ allOf:
161157
then:
162158
properties:
163159
reg-names:
164-
minItems: 3
165-
maxItems: 3
166160
items:
167161
- const: nand
168162
- const: nand-int-base
@@ -175,8 +169,6 @@ allOf:
175169
then:
176170
properties:
177171
reg-names:
178-
minItems: 3
179-
maxItems: 3
180172
items:
181173
- const: nand
182174
- const: iproc-idm

Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ properties:
3030
maxItems: 1
3131

3232
clocks:
33-
minItems: 2
3433
items:
3534
- description: PCLK clocks
3635
- description: EXTCLK clocks. Faraday calls it CLK1HZ and says the clock

Documentation/devicetree/bindings/usb/nxp,isp1760.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ properties:
2525

2626
interrupts:
2727
minItems: 1
28-
maxItems: 2
2928
items:
3029
- description: Host controller interrupt
3130
- description: Device controller interrupt in isp1761
3231

3332
interrupt-names:
3433
minItems: 1
35-
maxItems: 2
3634
items:
3735
- const: host
3836
- const: peripheral

0 commit comments

Comments
 (0)