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.
Unified · Split
| @@ -150,7 +150,6 @@ allOf: · 149 unmodified lines | |||
| 150 | description: 5 memory controller channels and 1 for stream-id registers | 150 | description: 5 memory controller channels and 1 for stream-id registers |
| 151 | 151 | ||
| 152 | reg-names: | 152 | reg-names: |
| 153 | maxItems: 6 | ||
| 154 | items: | 153 | items: |
| 155 | - const: sid | 154 | - const: sid |
| 156 | - const: broadcast | 155 | - const: broadcast |
| @@ -170,7 +169,6 @@ allOf: · 13 unmodified lines | |||
| 170 | description: 17 memory controller channels and 1 for stream-id registers | 169 | description: 17 memory controller channels and 1 for stream-id registers |
| 171 | 170 | ||
| 172 | reg-names: | 171 | reg-names: |
| 173 | minItems: 18 | ||
| 174 | items: | 172 | items: |
| 175 | - const: sid | 173 | - const: sid |
| 176 | - const: broadcast | 174 | - const: broadcast |
| @@ -202,7 +200,6 @@ allOf: · 25 unmodified lines | |||
| 202 | description: 17 memory controller channels and 1 for stream-id registers | 200 | description: 17 memory controller channels and 1 for stream-id registers |
| 203 | 201 | ||
| 204 | reg-names: | 202 | reg-names: |
| 205 | minItems: 18 | ||
| 206 | items: | 203 | items: |
| 207 | - const: sid | 204 | - const: sid |
| 208 | - const: broadcast | 205 | - const: broadcast |
| @@ -145,7 +145,6 @@ allOf: · 144 unmodified lines | |||
| 145 | items: | 145 | items: |
| 146 | - description: Xenon IP registers | 146 | - description: Xenon IP registers |
| 147 | - description: Armada 3700 SoC PHY PAD Voltage Control register | 147 | - description: Armada 3700 SoC PHY PAD Voltage Control register |
| 148 | minItems: 2 | ||
| 149 | 148 | ||
| 150 | marvell,pad-type: | 149 | marvell,pad-type: |
| 151 | $ref: /schemas/types.yaml#/definitions/string | 150 | $ref: /schemas/types.yaml#/definitions/string |
| @@ -64,7 +64,6 @@ if: · 63 unmodified lines | |||
| 64 | then: | 64 | then: |
| 65 | properties: | 65 | properties: |
| 66 | clocks: | 66 | clocks: |
| 67 | minItems: 2 | ||
| 68 | items: | 67 | items: |
| 69 | - description: High-frequency oscillator input, divided internally | 68 | - description: High-frequency oscillator input, divided internally |
| 70 | - description: Low-frequency oscillator input | 69 | - description: Low-frequency oscillator input |