* [PATCH] dt-bindings: Drop more redundant 'maxItems/minItems' in if/then schemas
@ 2022-06-06 22:51 Rob Herring
2022-06-07 6:34 ` Krzysztof Kozlowski
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Rob Herring @ 2022-06-06 22:51 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter, Hu Ziji,
Ulf Hansson, Wim Van Sebroeck, Guenter Roeck, Chen-Yu Tsai,
Jernej Skrabec, Samuel Holland, Maxime Ripard
Cc: linux-kernel, devicetree, linux-tegra, linux-mmc, linux-watchdog,
linux-arm-kernel, linux-sunxi
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: Rob Herring <robh@kernel.org>
---
.../bindings/memory-controllers/nvidia,tegra186-mc.yaml | 3 ---
Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 1 -
.../devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 1 -
3 files changed, 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
index c7cfa6c2cd81..935d63d181d9 100644
--- a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
+++ b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
@@ -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
diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
index c79639e9027e..7a2b22dd6d05 100644
--- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
+++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
@@ -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
diff --git a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
index cbcf19f51411..ed6c1ca80dcc 100644
--- a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
@@ -64,7 +64,6 @@ if:
then:
properties:
clocks:
- minItems: 2
items:
- description: High-frequency oscillator input, divided internally
- description: Low-frequency oscillator input
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] dt-bindings: Drop more redundant 'maxItems/minItems' in if/then schemas
2022-06-06 22:51 [PATCH] dt-bindings: Drop more redundant 'maxItems/minItems' in if/then schemas Rob Herring
@ 2022-06-07 6:34 ` Krzysztof Kozlowski
2022-06-07 10:42 ` Ulf Hansson
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2022-06-07 6:34 UTC (permalink / raw)
To: Rob Herring, Thierry Reding, Jonathan Hunter, Hu Ziji,
Ulf Hansson, Wim Van Sebroeck, Guenter Roeck, Chen-Yu Tsai,
Jernej Skrabec, Samuel Holland, Maxime Ripard
Cc: linux-kernel, devicetree, linux-tegra, linux-mmc, linux-watchdog,
linux-arm-kernel, linux-sunxi
On 07/06/2022 00:51, Rob Herring wrote:
> 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: Rob Herring <robh@kernel.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] dt-bindings: Drop more redundant 'maxItems/minItems' in if/then schemas
2022-06-06 22:51 [PATCH] dt-bindings: Drop more redundant 'maxItems/minItems' in if/then schemas Rob Herring
2022-06-07 6:34 ` Krzysztof Kozlowski
@ 2022-06-07 10:42 ` Ulf Hansson
2022-06-07 12:41 ` Guenter Roeck
2022-06-07 16:08 ` Rob Herring
3 siblings, 0 replies; 5+ messages in thread
From: Ulf Hansson @ 2022-06-07 10:42 UTC (permalink / raw)
To: Rob Herring
Cc: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter, Hu Ziji,
Wim Van Sebroeck, Guenter Roeck, Chen-Yu Tsai, Jernej Skrabec,
Samuel Holland, Maxime Ripard, linux-kernel, devicetree,
linux-tegra, linux-mmc, linux-watchdog, linux-arm-kernel,
linux-sunxi
On Tue, 7 Jun 2022 at 00:51, Rob Herring <robh@kernel.org> wrote:
>
> 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: Rob Herring <robh@kernel.org>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Kind regards
Uffe
> ---
> .../bindings/memory-controllers/nvidia,tegra186-mc.yaml | 3 ---
> Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 1 -
> .../devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 1 -
> 3 files changed, 5 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
> index c7cfa6c2cd81..935d63d181d9 100644
> --- a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
> +++ b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
> @@ -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
> diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
> index c79639e9027e..7a2b22dd6d05 100644
> --- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
> +++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
> @@ -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
> diff --git a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
> index cbcf19f51411..ed6c1ca80dcc 100644
> --- a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
> @@ -64,7 +64,6 @@ if:
> then:
> properties:
> clocks:
> - minItems: 2
> items:
> - description: High-frequency oscillator input, divided internally
> - description: Low-frequency oscillator input
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] dt-bindings: Drop more redundant 'maxItems/minItems' in if/then schemas
2022-06-06 22:51 [PATCH] dt-bindings: Drop more redundant 'maxItems/minItems' in if/then schemas Rob Herring
2022-06-07 6:34 ` Krzysztof Kozlowski
2022-06-07 10:42 ` Ulf Hansson
@ 2022-06-07 12:41 ` Guenter Roeck
2022-06-07 16:08 ` Rob Herring
3 siblings, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2022-06-07 12:41 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Thierry Reding,
Jonathan Hunter, Hu Ziji, Ulf Hansson, Wim Van Sebroeck,
Chen-Yu Tsai, Jernej Skrabec, Samuel Holland, Maxime Ripard
Cc: linux-kernel, devicetree, linux-tegra, linux-mmc, linux-watchdog,
linux-arm-kernel, linux-sunxi
On 6/6/22 15:51, Rob Herring wrote:
> 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: Rob Herring <robh@kernel.org>
> ---
> .../bindings/memory-controllers/nvidia,tegra186-mc.yaml | 3 ---
> Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 1 -
> .../devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 1 -
Acked-by: Guenter Roeck <linux@roeck-us.net>
> 3 files changed, 5 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
> index c7cfa6c2cd81..935d63d181d9 100644
> --- a/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
> +++ b/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
> @@ -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
> diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
> index c79639e9027e..7a2b22dd6d05 100644
> --- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
> +++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
> @@ -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
> diff --git a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
> index cbcf19f51411..ed6c1ca80dcc 100644
> --- a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
> @@ -64,7 +64,6 @@ if:
> then:
> properties:
> clocks:
> - minItems: 2
> items:
> - description: High-frequency oscillator input, divided internally
> - description: Low-frequency oscillator input
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] dt-bindings: Drop more redundant 'maxItems/minItems' in if/then schemas
2022-06-06 22:51 [PATCH] dt-bindings: Drop more redundant 'maxItems/minItems' in if/then schemas Rob Herring
` (2 preceding siblings ...)
2022-06-07 12:41 ` Guenter Roeck
@ 2022-06-07 16:08 ` Rob Herring
3 siblings, 0 replies; 5+ messages in thread
From: Rob Herring @ 2022-06-07 16:08 UTC (permalink / raw)
To: Rob Herring
Cc: linux-sunxi, linux-watchdog, Maxime Ripard, linux-kernel,
devicetree, Krzysztof Kozlowski, Ulf Hansson, Hu Ziji,
linux-arm-kernel, Chen-Yu Tsai, Guenter Roeck, Thierry Reding,
linux-tegra, Wim Van Sebroeck, linux-mmc, Jonathan Hunter,
Jernej Skrabec, Samuel Holland
On Mon, 06 Jun 2022 17:51:36 -0500, Rob Herring wrote:
> 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: Rob Herring <robh@kernel.org>
> ---
> .../bindings/memory-controllers/nvidia,tegra186-mc.yaml | 3 ---
> Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 1 -
> .../devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 1 -
> 3 files changed, 5 deletions(-)
>
Applied, thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-06-07 16:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-06 22:51 [PATCH] dt-bindings: Drop more redundant 'maxItems/minItems' in if/then schemas Rob Herring
2022-06-07 6:34 ` Krzysztof Kozlowski
2022-06-07 10:42 ` Ulf Hansson
2022-06-07 12:41 ` Guenter Roeck
2022-06-07 16:08 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).