[PATCH 1/2] dt-bindings: net: starfive,jh7110-dwmac: Add StarFive JH8100 support

Tan Chun Hau posted 2 patches 1 year, 11 months ago
There is a newer version of this series
[PATCH 1/2] dt-bindings: net: starfive,jh7110-dwmac: Add StarFive JH8100 support
Posted by Tan Chun Hau 1 year, 11 months ago
Add StarFive JH8100 dwmac support.
JH8100 dwmac has one reset signal instead of 2 resets as in JH7110.

Signed-off-by: Tan Chun Hau <chunhau.tan@starfivetech.com>
---
 .../bindings/net/starfive,jh7110-dwmac.yaml   | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
index 5e7cfbbebce6..3d0447726902 100644
--- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
@@ -17,6 +17,7 @@ select:
       contains:
         enum:
           - starfive,jh7110-dwmac
+          - starfive,jh8100-dwmac
   required:
     - compatible
 
@@ -25,6 +26,7 @@ properties:
     items:
       - enum:
           - starfive,jh7110-dwmac
+          - starfive,jh8100-dwmac
       - const: snps,dwmac-5.20
 
   reg:
@@ -54,16 +56,6 @@ properties:
     minItems: 3
     maxItems: 3
 
-  resets:
-    items:
-      - description: MAC Reset signal.
-      - description: AHB Reset signal.
-
-  reset-names:
-    items:
-      - const: stmmaceth
-      - const: ahb
-
   starfive,tx-use-rgmii-clk:
     description:
       Tx clock is provided by external rgmii clock.
@@ -93,6 +85,22 @@ required:
 
 allOf:
   - $ref: snps,dwmac.yaml#
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - starfive,jh7110-dwmac
+    then:
+      properties:
+        resets:
+          items:
+            - description: MAC Reset signal.
+            - description: AHB Reset signal.
+        resets-names:
+          items:
+            - const: stmmaceth
+            - const: ahb
 
 unevaluatedProperties: false
 
-- 
2.25.1
Re: [PATCH 1/2] dt-bindings: net: starfive,jh7110-dwmac: Add StarFive JH8100 support
Posted by Krzysztof Kozlowski 1 year, 11 months ago
On 08/01/2024 08:58, Tan Chun Hau wrote:
> Add StarFive JH8100 dwmac support.
> JH8100 dwmac has one reset signal instead of 2 resets as in JH7110.
> 
> Signed-off-by: Tan Chun Hau <chunhau.tan@starfivetech.com>
> ---
>  .../bindings/net/starfive,jh7110-dwmac.yaml   | 28 ++++++++++++-------
>  1 file changed, 18 insertions(+), 10 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
> index 5e7cfbbebce6..3d0447726902 100644
> --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
> +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
> @@ -17,6 +17,7 @@ select:
>        contains:
>          enum:
>            - starfive,jh7110-dwmac
> +          - starfive,jh8100-dwmac

I have doubts that you tested it. Missing change to snps,dwmac.

>    required:
>      - compatible
>  
> @@ -25,6 +26,7 @@ properties:
>      items:
>        - enum:
>            - starfive,jh7110-dwmac
> +          - starfive,jh8100-dwmac
>        - const: snps,dwmac-5.20
>  
>    reg:
> @@ -54,16 +56,6 @@ properties:
>      minItems: 3
>      maxItems: 3
>  
> -  resets:
> -    items:
> -      - description: MAC Reset signal.
> -      - description: AHB Reset signal.
> -
> -  reset-names:
> -    items:
> -      - const: stmmaceth
> -      - const: ahb
> -
>    starfive,tx-use-rgmii-clk:
>      description:
>        Tx clock is provided by external rgmii clock.
> @@ -93,6 +85,22 @@ required:
>  
>  allOf:
>    - $ref: snps,dwmac.yaml#
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            enum:
> +              - starfive,jh7110-dwmac
> +    then:
> +      properties:
> +        resets:
> +          items:
> +            - description: MAC Reset signal.
> +            - description: AHB Reset signal.
> +        resets-names:
> +          items:
> +            - const: stmmaceth
> +            - const: ahb

Missing else: narrowing your jh8100.

Best regards,
Krzysztof