[PATCH 0/2] dt-bindings: net: Fix ave descriptions

[PATCH 0/2] dt-bindings: net: Fix ave descriptions

[Kunihiko Hayashi]

This series fixes dt-schema descriptions for ave4 controller.

Kunihiko Hayashi (2):
  dt-bindings: net: ave: Clean up clocks, resets, and their names using
    compatible string
  dt-bindings: net: ave: Use unevaluatedProperties

 .../bindings/net/socionext,uniphier-ave4.yaml | 57 +++++++++++++------
 1 file changed, 39 insertions(+), 18 deletions(-)

-- 
2.25.1

[PATCH 1/2] dt-bindings: net: ave: Clean up clocks, resets, and their names using compatible string

[Kunihiko Hayashi]

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 <hayashi.kunihiko@socionext.com>
---
 .../bindings/net/socionext,uniphier-ave4.yaml | 55 +++++++++++++------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml b/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml
index e602761f7b14..f257520b9a7e 100644
--- a/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml
+++ b/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml
@@ -13,9 +13,6 @@ description: |
   This describes the devicetree bindings for AVE ethernet controller
   implemented on Socionext UniPhier SoCs.
 
-allOf:
-  - $ref: ethernet-controller.yaml#
-
 properties:
   compatible:
     enum:
@@ -44,25 +41,13 @@ properties:
     minItems: 1
     maxItems: 4
 
-  clock-names:
-    oneOf:
-      - items:          # for Pro4
-          - const: gio
-          - const: ether
-          - const: ether-gb
-          - const: ether-phy
-      - const: ether    # for others
+  clock-names: true
 
   resets:
     minItems: 1
     maxItems: 2
 
-  reset-names:
-    oneOf:
-      - items:          # for Pro4
-          - const: gio
-          - const: ether
-      - const: ether    # for others
+  reset-names: true
 
   socionext,syscon-phy-mode:
     $ref: /schemas/types.yaml#/definitions/phandle-array
@@ -78,6 +63,42 @@ properties:
     $ref: mdio.yaml#
     unevaluatedProperties: false
 
+allOf:
+  - $ref: ethernet-controller.yaml#
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: socionext,uniphier-pro4-ave4
+    then:
+      properties:
+        clocks:
+          minItems: 4
+          maxItems: 4
+        clock-names:
+          items:
+            - const: gio
+            - const: ether
+            - const: ether-gb
+            - const: ether-phy
+        resets:
+          minItems: 2
+          maxItems: 2
+        reset-names:
+          items:
+            - const: gio
+            - const: ether
+    else:
+      properties:
+        clocks:
+          maxItems: 1
+        clock-names:
+          const: ether
+        resets:
+          maxItems: 1
+        reset-names:
+          const: ether
+
 required:
   - compatible
   - reg
-- 
2.25.1

[PATCH 2/2] dt-bindings: net: ave: Use unevaluatedProperties

[Kunihiko Hayashi]

This refers common bindings, so this is preferred for
unevaluatedProperties instead of additionalProperties.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 .../devicetree/bindings/net/socionext,uniphier-ave4.yaml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml b/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml
index f257520b9a7e..b0ebcef6801c 100644
--- a/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml
+++ b/Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml
@@ -111,7 +111,7 @@ required:
   - reset-names
   - mdio
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
-- 
2.25.1

Re: [PATCH 1/2] dt-bindings: net: ave: Clean up clocks, resets, and their names using compatible string

[Rob Herring]

On Tue, 05 Apr 2022 16:53:00 +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 <hayashi.kunihiko@socionext.com>
> ---
>  .../bindings/net/socionext,uniphier-ave4.yaml | 55 +++++++++++++------
>  1 file changed, 38 insertions(+), 17 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCH 2/2] dt-bindings: net: ave: Use unevaluatedProperties

[Rob Herring]

On Tue, 05 Apr 2022 16:53:01 +0900, Kunihiko Hayashi wrote:
> This refers common bindings, so this is preferred for
> unevaluatedProperties instead of additionalProperties.
> 
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
>  .../devicetree/bindings/net/socionext,uniphier-ave4.yaml        | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH 0/2] dt-bindings: net: Fix ave descriptions

[Paolo Abeni]

Hi,

On Tue, 2022-04-05 at 16:52 +0900, Kunihiko Hayashi wrote:
> This series fixes dt-schema descriptions for ave4 controller.
> 
> Kunihiko Hayashi (2):
>   dt-bindings: net: ave: Clean up clocks, resets, and their names using
>     compatible string
>   dt-bindings: net: ave: Use unevaluatedProperties
> 
>  .../bindings/net/socionext,uniphier-ave4.yaml | 57 +++++++++++++------
>  1 file changed, 39 insertions(+), 18 deletions(-)

@Rob: since you acked this series, I guess you prefer/except this will
go via net net-next tree, is that correct?

Thanks!

Paolo

Re: [PATCH 0/2] dt-bindings: net: Fix ave descriptions

[Rob Herring]

On Thu, Apr 07, 2022 at 10:18:29AM +0200, Paolo Abeni wrote:
> Hi,
> 
> On Tue, 2022-04-05 at 16:52 +0900, Kunihiko Hayashi wrote:
> > This series fixes dt-schema descriptions for ave4 controller.
> > 
> > Kunihiko Hayashi (2):
> >   dt-bindings: net: ave: Clean up clocks, resets, and their names using
> >     compatible string
> >   dt-bindings: net: ave: Use unevaluatedProperties
> > 
> >  .../bindings/net/socionext,uniphier-ave4.yaml | 57 +++++++++++++------
> >  1 file changed, 39 insertions(+), 18 deletions(-)
> 
> @Rob: since you acked this series, I guess you prefer/except this will
> go via net net-next tree, is that correct?

Yes, please. Though often I pick up the standalone DT net patches 
because the netdev maintainers haven't. 

Rob

Re: [PATCH 0/2] dt-bindings: net: Fix ave descriptions

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:

On Tue,  5 Apr 2022 16:52:59 +0900 you wrote:
> This series fixes dt-schema descriptions for ave4 controller.
> 
> Kunihiko Hayashi (2):
>   dt-bindings: net: ave: Clean up clocks, resets, and their names using
>     compatible string
>   dt-bindings: net: ave: Use unevaluatedProperties
> 
> [...]

Here is the summary with links:
  - [1/2] dt-bindings: net: ave: Clean up clocks, resets, and their names using compatible string
    https://git.kernel.org/netdev/net/c/2610bd72efe4
  - [2/2] dt-bindings: net: ave: Use unevaluatedProperties
    https://git.kernel.org/netdev/net/c/5a80059d8804

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html