2022-04-05 21:44:13

by Kunihiko Hayashi

Subject: [PATCH] dt-bindings: reset: uniphier-glue: Clean up clocks, resets, and their names using compatible string

Instead of "oneOf:" choices, use "allOf:" and "if:" to define clocks,
resets, and their names that can be taken by the compatible string.

The order of clock-names and reset-names doesn't change here.

Signed-off-by: Kunihiko Hayashi <[email protected]>
---
.../reset/socionext,uniphier-glue-reset.yaml | 52 ++++++++++++++-----
1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/Documentation/devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml b/Documentation/devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml
index bfbd3e9b4186..0a2c13e1e230 100644
--- a/Documentation/devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml
+++ b/Documentation/devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml
@@ -38,25 +38,49 @@ properties:
minItems: 1
maxItems: 2

- clock-names:
- oneOf:
- - items: # for Pro4, Pro5
- - const: gio
- - const: link
- - items: # for others
- - const: link
+ clock-names: true

resets:
minItems: 1
maxItems: 2

- reset-names:
- oneOf:
- - items: # for Pro4, Pro5
- - const: gio
- - const: link
- - items: # for others
- - const: link
+ reset-names: true
+
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - socionext,uniphier-pro4-usb3-reset
+ - socionext,uniphier-pro5-usb3-reset
+ - socionext,uniphier-pro4-ahci-reset
+ then:
+ properties:
+ clocks:
+ minItems: 2
+ maxItems: 2
+ clock-names:
+ items:
+ - const: gio
+ - const: link
+ resets:
+ minItems: 2
+ maxItems: 2
+ reset-names:
+ items:
+ - const: gio
+ - const: link
+ else:
+ properties:
+ clocks:
+ maxItems: 1
+ clock-names:
+ const: link
+ resets:
+ maxItems: 1
+ reset-names:
+ const: link

additionalProperties: false

--
2.25.1

2022-04-06 20:03:37

by Rob Herring (Arm)

Subject: Re: [PATCH] dt-bindings: reset: uniphier-glue: Clean up clocks, resets, and their names using compatible string

On Tue, 05 Apr 2022 16:56:18 +0900, Kunihiko Hayashi wrote:
> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clocks,
> resets, and their names that can be taken by the compatible string.
>
> The order of clock-names and reset-names doesn't change here.
>
> Signed-off-by: Kunihiko Hayashi <[email protected]>
> ---
> .../reset/socionext,uniphier-glue-reset.yaml | 52 ++++++++++++++-----
> 1 file changed, 38 insertions(+), 14 deletions(-)
>

Reviewed-by: Rob Herring <[email protected]>

2022-04-07 20:27:24

by Philipp Zabel

Subject: Re: [PATCH] dt-bindings: reset: uniphier-glue: Clean up clocks, resets, and their names using compatible string

On Di, 2022-04-05 at 16:56 +0900, Kunihiko Hayashi wrote:
> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clocks,
> resets, and their names that can be taken by the compatible string.
>
> The order of clock-names and reset-names doesn't change here.
>
> Signed-off-by: Kunihiko Hayashi <[email protected]>

Thank you, applied to reset/next.

regards
Philipp