Message ID | 20210713193453.690290-1-robh@kernel.org |
---|---|
State | New |
Headers | show |
Series | dt-bindings: More dropping redundant minItems/maxItems | expand |
Hi Rob, Thank you for the patch. On Tue, Jul 13, 2021 at 01:34:53PM -0600, Rob Herring wrote: > 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: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > .../devicetree/bindings/clock/brcm,iproc-clocks.yaml | 1 - > .../devicetree/bindings/iommu/rockchip,iommu.yaml | 2 -- > .../bindings/memory-controllers/arm,pl353-smc.yaml | 1 - > Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml | 8 -------- > .../devicetree/bindings/rtc/faraday,ftrtc010.yaml | 1 - > Documentation/devicetree/bindings/usb/nxp,isp1760.yaml | 2 -- > 6 files changed, 15 deletions(-) > > diff --git a/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml b/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml > index 8dc7b404ee12..1174c9aa9934 100644 > --- a/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml > +++ b/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml > @@ -50,7 +50,6 @@ properties: > > reg: > minItems: 1 > - maxItems: 3 > items: > - description: base register > - description: power register > diff --git a/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml b/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml > index d2e28a9e3545..ba9124f721f1 100644 > --- a/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml > +++ b/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml > @@ -28,14 +28,12 @@ properties: > - description: configuration registers for MMU instance 0 > - description: configuration registers for MMU instance 1 > minItems: 1 > - maxItems: 2 > > interrupts: > items: > - description: interruption for MMU instance 0 > - description: interruption for MMU instance 1 > minItems: 1 > - maxItems: 2 > > clocks: > items: > diff --git a/Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml b/Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml > index 7a63c85ef8c5..01c9acf9275d 100644 > --- a/Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml > +++ b/Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml > @@ -57,7 +57,6 @@ properties: > > ranges: > minItems: 1 > - maxItems: 3 > description: | > Memory bus areas for interacting with the devices. Reflects > the memory layout with four integer values following: > diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml > index e5f1a33332a5..dd5a64969e37 100644 > --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml > +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml > @@ -84,7 +84,6 @@ properties: > > interrupts: > minItems: 1 > - maxItems: 3 > items: > - description: NAND CTLRDY interrupt > - description: FLASH_DMA_DONE if flash DMA is available > @@ -92,7 +91,6 @@ properties: > > interrupt-names: > minItems: 1 > - maxItems: 3 > items: > - const: nand_ctlrdy > - const: flash_dma_done > @@ -148,8 +146,6 @@ allOf: > then: > properties: > reg-names: > - minItems: 2 > - maxItems: 2 > items: > - const: nand > - const: nand-int-base > @@ -161,8 +157,6 @@ allOf: > then: > properties: > reg-names: > - minItems: 3 > - maxItems: 3 > items: > - const: nand > - const: nand-int-base > @@ -175,8 +169,6 @@ allOf: > then: > properties: > reg-names: > - minItems: 3 > - maxItems: 3 > items: > - const: nand > - const: iproc-idm > diff --git a/Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml b/Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml > index 657c13b62b67..056d42daae06 100644 > --- a/Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml > +++ b/Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml > @@ -30,7 +30,6 @@ properties: > maxItems: 1 > > clocks: > - minItems: 2 > items: > - description: PCLK clocks > - description: EXTCLK clocks. Faraday calls it CLK1HZ and says the clock > diff --git a/Documentation/devicetree/bindings/usb/nxp,isp1760.yaml b/Documentation/devicetree/bindings/usb/nxp,isp1760.yaml > index a88f99adfe8e..f238848ad094 100644 > --- a/Documentation/devicetree/bindings/usb/nxp,isp1760.yaml > +++ b/Documentation/devicetree/bindings/usb/nxp,isp1760.yaml > @@ -25,14 +25,12 @@ properties: > > interrupts: > minItems: 1 > - maxItems: 2 > items: > - description: Host controller interrupt > - description: Device controller interrupt in isp1761 > > interrupt-names: > minItems: 1 > - maxItems: 2 > items: > - const: host > - const: peripheral
Quoting Rob Herring (2021-07-13 12:34:53) > 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: Stephen Boyd <sboyd@kernel.org>
diff --git a/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml b/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml index 8dc7b404ee12..1174c9aa9934 100644 --- a/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml +++ b/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml @@ -50,7 +50,6 @@ properties: reg: minItems: 1 - maxItems: 3 items: - description: base register - description: power register diff --git a/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml b/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml index d2e28a9e3545..ba9124f721f1 100644 --- a/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml +++ b/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml @@ -28,14 +28,12 @@ properties: - description: configuration registers for MMU instance 0 - description: configuration registers for MMU instance 1 minItems: 1 - maxItems: 2 interrupts: items: - description: interruption for MMU instance 0 - description: interruption for MMU instance 1 minItems: 1 - maxItems: 2 clocks: items: diff --git a/Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml b/Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml index 7a63c85ef8c5..01c9acf9275d 100644 --- a/Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml +++ b/Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml @@ -57,7 +57,6 @@ properties: ranges: minItems: 1 - maxItems: 3 description: | Memory bus areas for interacting with the devices. Reflects the memory layout with four integer values following: diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml index e5f1a33332a5..dd5a64969e37 100644 --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml @@ -84,7 +84,6 @@ properties: interrupts: minItems: 1 - maxItems: 3 items: - description: NAND CTLRDY interrupt - description: FLASH_DMA_DONE if flash DMA is available @@ -92,7 +91,6 @@ properties: interrupt-names: minItems: 1 - maxItems: 3 items: - const: nand_ctlrdy - const: flash_dma_done @@ -148,8 +146,6 @@ allOf: then: properties: reg-names: - minItems: 2 - maxItems: 2 items: - const: nand - const: nand-int-base @@ -161,8 +157,6 @@ allOf: then: properties: reg-names: - minItems: 3 - maxItems: 3 items: - const: nand - const: nand-int-base @@ -175,8 +169,6 @@ allOf: then: properties: reg-names: - minItems: 3 - maxItems: 3 items: - const: nand - const: iproc-idm diff --git a/Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml b/Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml index 657c13b62b67..056d42daae06 100644 --- a/Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml +++ b/Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml @@ -30,7 +30,6 @@ properties: maxItems: 1 clocks: - minItems: 2 items: - description: PCLK clocks - description: EXTCLK clocks. Faraday calls it CLK1HZ and says the clock diff --git a/Documentation/devicetree/bindings/usb/nxp,isp1760.yaml b/Documentation/devicetree/bindings/usb/nxp,isp1760.yaml index a88f99adfe8e..f238848ad094 100644 --- a/Documentation/devicetree/bindings/usb/nxp,isp1760.yaml +++ b/Documentation/devicetree/bindings/usb/nxp,isp1760.yaml @@ -25,14 +25,12 @@ properties: interrupts: minItems: 1 - maxItems: 2 items: - description: Host controller interrupt - description: Device controller interrupt in isp1761 interrupt-names: minItems: 1 - maxItems: 2 items: - const: host - const: peripheral
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> --- .../devicetree/bindings/clock/brcm,iproc-clocks.yaml | 1 - .../devicetree/bindings/iommu/rockchip,iommu.yaml | 2 -- .../bindings/memory-controllers/arm,pl353-smc.yaml | 1 - Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml | 8 -------- .../devicetree/bindings/rtc/faraday,ftrtc010.yaml | 1 - Documentation/devicetree/bindings/usb/nxp,isp1760.yaml | 2 -- 6 files changed, 15 deletions(-)