Commit 927c63e0 authored by Rob Herring's avatar Rob Herring
Browse files

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



Another round from new cases in 5.19-rc 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: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20220606225137.1536010-1-robh@kernel.org
parent c3c09e39

Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml

+0 −3
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ allOf: 
          description: 5 memory controller channels and 1 for stream-id registers



        reg-names:

          maxItems: 6

          items:

            - const: sid

            - const: broadcast
@@ -170,7 +169,6 @@ allOf: 
          description: 17 memory controller channels and 1 for stream-id registers



        reg-names:

          minItems: 18

          items:

            - const: sid

            - const: broadcast
@@ -202,7 +200,6 @@ allOf: 
          description: 17 memory controller channels and 1 for stream-id registers



        reg-names:

          minItems: 18

          items:

            - const: sid

            - const: broadcast

Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ allOf: 
          items:

            - description: Xenon IP registers

            - description: Armada 3700 SoC PHY PAD Voltage Control register

          minItems: 2



        marvell,pad-type:

          $ref: /schemas/types.yaml#/definitions/string

Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ if: 
then:

  properties:

    clocks:

      minItems: 2

      items:

        - description: High-frequency oscillator input, divided internally

        - description: Low-frequency oscillator input