diff mbox series

[v2,net-next,02/13] dt-bindings: net: add i.MX95 ENETC support

Message ID 20241015125841.1075560-3-wei.fang@nxp.com (mailing list archive)
State Superseded
Headers show
Series add basic support for i.MX95 NETC | expand

Commit Message

Wei Fang Oct. 15, 2024, 12:58 p.m. UTC
The ENETC of i.MX95 has been upgraded to revision 4.1, and the vendor
ID and device ID have also changed, so add the new compatible strings
for i.MX95 ENETC. In addition, i.MX95 supports configuration of RGMII
or RMII reference clock.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
v2 changes: remove "nxp,imx95-enetc" compatible string.
---
 .../devicetree/bindings/net/fsl,enetc.yaml    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

Comments

Frank Li Oct. 15, 2024, 3:40 p.m. UTC | #1
On Tue, Oct 15, 2024 at 08:58:30PM +0800, Wei Fang wrote:
> The ENETC of i.MX95 has been upgraded to revision 4.1, and the vendor
> ID and device ID have also changed, so add the new compatible strings
> for i.MX95 ENETC. In addition, i.MX95 supports configuration of RGMII
> or RMII reference clock.
>
> Signed-off-by: Wei Fang <wei.fang@nxp.com>
> ---
> v2 changes: remove "nxp,imx95-enetc" compatible string.
> ---
>  .../devicetree/bindings/net/fsl,enetc.yaml    | 19 +++++++++++++++----
>  1 file changed, 15 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/net/fsl,enetc.yaml b/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> index e152c93998fe..409ac4c09f63 100644
> --- a/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> +++ b/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> @@ -20,14 +20,25 @@ maintainers:
>
>  properties:
>    compatible:
> -    items:
> -      - enum:
> -          - pci1957,e100
> -      - const: fsl,enetc
> +    oneOf:
> +      - items:
> +          - enum:
> +              - pci1957,e100
> +          - const: fsl,enetc
> +      - items:
> +          - const: pci1131,e101
>
>    reg:
>      maxItems: 1
>
> +  clocks:
> +    items:
> +      - description: MAC transmit/receiver reference clock
> +
> +  clock-names:
> +    items:
> +      - const: enet_ref_clk
> +

Need use allOf to keep old restriction

allOf:
  - if
     ...
  - then:
      properties:
        clocks:
          minItems: 1
        clock-names:
          minItems: 1
  - else
      properties:
        clocks: false
        clock-names: false


>    mdio:
>      $ref: mdio.yaml
>      unevaluatedProperties: false
> --
> 2.34.1
>
Rob Herring (Arm) Oct. 15, 2024, 9:58 p.m. UTC | #2
On Tue, Oct 15, 2024 at 08:58:30PM +0800, Wei Fang wrote:
> The ENETC of i.MX95 has been upgraded to revision 4.1, and the vendor
> ID and device ID have also changed, so add the new compatible strings
> for i.MX95 ENETC. In addition, i.MX95 supports configuration of RGMII
> or RMII reference clock.
> 
> Signed-off-by: Wei Fang <wei.fang@nxp.com>
> ---
> v2 changes: remove "nxp,imx95-enetc" compatible string.
> ---
>  .../devicetree/bindings/net/fsl,enetc.yaml    | 19 +++++++++++++++----
>  1 file changed, 15 insertions(+), 4 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/net/fsl,enetc.yaml b/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> index e152c93998fe..409ac4c09f63 100644
> --- a/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> +++ b/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> @@ -20,14 +20,25 @@ maintainers:
>  
>  properties:
>    compatible:
> -    items:
> -      - enum:
> -          - pci1957,e100
> -      - const: fsl,enetc
> +    oneOf:
> +      - items:
> +          - enum:
> +              - pci1957,e100
> +          - const: fsl,enetc
> +      - items:

You can omit items here.

> +          - const: pci1131,e101
>  
>    reg:
>      maxItems: 1
>  
> +  clocks:
> +    items:
> +      - description: MAC transmit/receiver reference clock
> +
> +  clock-names:
> +    items:
> +      - const: enet_ref_clk

Clock names are local to the block, so 'enet_' is redundant. It's all 
clock names, so '_clk' is redundant too. IOW, just use 'ref'.

> +
>    mdio:
>      $ref: mdio.yaml
>      unevaluatedProperties: false
> -- 
> 2.34.1
>
Wei Fang Oct. 16, 2024, 1:21 a.m. UTC | #3
> -----Original Message-----
> From: Frank Li <frank.li@nxp.com>
> Sent: 2024年10月15日 23:41
> To: Wei Fang <wei.fang@nxp.com>
> Cc: davem@davemloft.net; edumazet@google.com; kuba@kernel.org;
> pabeni@redhat.com; robh@kernel.org; krzk+dt@kernel.org;
> conor+dt@kernel.org; Vladimir Oltean <vladimir.oltean@nxp.com>; Claudiu
> Manoil <claudiu.manoil@nxp.com>; Clark Wang <xiaoning.wang@nxp.com>;
> christophe.leroy@csgroup.eu; linux@armlinux.org.uk; bhelgaas@google.com;
> horms@kernel.org; imx@lists.linux.dev; netdev@vger.kernel.org;
> devicetree@vger.kernel.org; linux-kernel@vger.kernel.org;
> linux-pci@vger.kernel.org
> Subject: Re: [PATCH v2 net-next 02/13] dt-bindings: net: add i.MX95 ENETC
> support
> 
> On Tue, Oct 15, 2024 at 08:58:30PM +0800, Wei Fang wrote:
> > The ENETC of i.MX95 has been upgraded to revision 4.1, and the vendor
> > ID and device ID have also changed, so add the new compatible strings
> > for i.MX95 ENETC. In addition, i.MX95 supports configuration of RGMII
> > or RMII reference clock.
> >
> > Signed-off-by: Wei Fang <wei.fang@nxp.com>
> > ---
> > v2 changes: remove "nxp,imx95-enetc" compatible string.
> > ---
> >  .../devicetree/bindings/net/fsl,enetc.yaml    | 19 +++++++++++++++----
> >  1 file changed, 15 insertions(+), 4 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> > b/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> > index e152c93998fe..409ac4c09f63 100644
> > --- a/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> > +++ b/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> > @@ -20,14 +20,25 @@ maintainers:
> >
> >  properties:
> >    compatible:
> > -    items:
> > -      - enum:
> > -          - pci1957,e100
> > -      - const: fsl,enetc
> > +    oneOf:
> > +      - items:
> > +          - enum:
> > +              - pci1957,e100
> > +          - const: fsl,enetc
> > +      - items:
> > +          - const: pci1131,e101
> >
> >    reg:
> >      maxItems: 1
> >
> > +  clocks:
> > +    items:
> > +      - description: MAC transmit/receiver reference clock
> > +
> > +  clock-names:
> > +    items:
> > +      - const: enet_ref_clk
> > +
> 
> Need use allOf to keep old restriction

Okay, I will add the restriction.
> 
> allOf:
>   - if
>      ...
>   - then:
>       properties:
>         clocks:
>           minItems: 1
>         clock-names:
>           minItems: 1
>   - else
>       properties:
>         clocks: false
>         clock-names: false
> 
> 
> >    mdio:
> >      $ref: mdio.yaml
> >      unevaluatedProperties: false
> > --
> > 2.34.1
> >
Wei Fang Oct. 16, 2024, 2:06 a.m. UTC | #4
> -----Original Message-----
> From: Rob Herring <robh@kernel.org>
> Sent: 2024年10月16日 5:59
> To: Wei Fang <wei.fang@nxp.com>
> Cc: davem@davemloft.net; edumazet@google.com; kuba@kernel.org;
> pabeni@redhat.com; krzk+dt@kernel.org; conor+dt@kernel.org; Vladimir
> Oltean <vladimir.oltean@nxp.com>; Claudiu Manoil
> <claudiu.manoil@nxp.com>; Clark Wang <xiaoning.wang@nxp.com>; Frank Li
> <frank.li@nxp.com>; christophe.leroy@csgroup.eu; linux@armlinux.org.uk;
> bhelgaas@google.com; horms@kernel.org; imx@lists.linux.dev;
> netdev@vger.kernel.org; devicetree@vger.kernel.org;
> linux-kernel@vger.kernel.org; linux-pci@vger.kernel.org
> Subject: Re: [PATCH v2 net-next 02/13] dt-bindings: net: add i.MX95 ENETC
> support
> 
> On Tue, Oct 15, 2024 at 08:58:30PM +0800, Wei Fang wrote:
> > The ENETC of i.MX95 has been upgraded to revision 4.1, and the vendor
> > ID and device ID have also changed, so add the new compatible strings
> > for i.MX95 ENETC. In addition, i.MX95 supports configuration of RGMII
> > or RMII reference clock.
> >
> > Signed-off-by: Wei Fang <wei.fang@nxp.com>
> > ---
> > v2 changes: remove "nxp,imx95-enetc" compatible string.
> > ---
> >  .../devicetree/bindings/net/fsl,enetc.yaml    | 19 +++++++++++++++----
> >  1 file changed, 15 insertions(+), 4 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> b/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> > index e152c93998fe..409ac4c09f63 100644
> > --- a/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> > +++ b/Documentation/devicetree/bindings/net/fsl,enetc.yaml
> > @@ -20,14 +20,25 @@ maintainers:
> >
> >  properties:
> >    compatible:
> > -    items:
> > -      - enum:
> > -          - pci1957,e100
> > -      - const: fsl,enetc
> > +    oneOf:
> > +      - items:
> > +          - enum:
> > +              - pci1957,e100
> > +          - const: fsl,enetc
> > +      - items:
> 
> You can omit items here.
> 
> > +          - const: pci1131,e101
> >
> >    reg:
> >      maxItems: 1
> >
> > +  clocks:
> > +    items:
> > +      - description: MAC transmit/receiver reference clock
> > +
> > +  clock-names:
> > +    items:
> > +      - const: enet_ref_clk
> 
> Clock names are local to the block, so 'enet_' is redundant. It's all
> clock names, so '_clk' is redundant too. IOW, just use 'ref'.
>
Okay, I'll change its name.

> > +
> >    mdio:
> >      $ref: mdio.yaml
> >      unevaluatedProperties: false
> > --
> > 2.34.1
> >
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/net/fsl,enetc.yaml b/Documentation/devicetree/bindings/net/fsl,enetc.yaml
index e152c93998fe..409ac4c09f63 100644
--- a/Documentation/devicetree/bindings/net/fsl,enetc.yaml
+++ b/Documentation/devicetree/bindings/net/fsl,enetc.yaml
@@ -20,14 +20,25 @@  maintainers:
 
 properties:
   compatible:
-    items:
-      - enum:
-          - pci1957,e100
-      - const: fsl,enetc
+    oneOf:
+      - items:
+          - enum:
+              - pci1957,e100
+          - const: fsl,enetc
+      - items:
+          - const: pci1131,e101
 
   reg:
     maxItems: 1
 
+  clocks:
+    items:
+      - description: MAC transmit/receiver reference clock
+
+  clock-names:
+    items:
+      - const: enet_ref_clk
+
   mdio:
     $ref: mdio.yaml
     unevaluatedProperties: false