| Message ID | 20241030093924.1251343-3-wei.fang@nxp.com |
|---|---|
| State | Needs Review / ACK |
| Headers | show |
| Series | add basic support for i.MX95 NETC | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success | |
| robh/patch-applied | success | |
| robh/dtbs-check | warning | build log |
| robh/dt-meta-schema | success |
On Wed, Oct 30, 2024 at 05:39:13PM +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> Reviewed-by: Frank Li <Frank.Li@nxp.com> > --- > v2: Remove "nxp,imx95-enetc" compatible string. > v3: > 1. Add restriction to "clcoks" and "clock-names" properties and rename > the clock, also remove the items from these two properties. > 2. Remove unnecessary items for "pci1131,e101" compatible string. > v4: Move clocks and clock-names to top level. > v5: Add items to clocks and clock-names > v6: > 1. use negate the 'if' schema (not: contains: ...) > --- > .../devicetree/bindings/net/fsl,enetc.yaml | 28 +++++++++++++++++-- > 1 file changed, 25 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/fsl,enetc.yaml b/Documentation/devicetree/bindings/net/fsl,enetc.yaml > index e152c93998fe..ca70f0050171 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: > + oneOf: > + - items: > + - enum: > + - pci1957,e100 > + - const: fsl,enetc > - enum: > - - pci1957,e100 > - - const: fsl,enetc > + - pci1131,e101 > > reg: > maxItems: 1 > > + clocks: > + items: > + - description: MAC transmit/receive reference clock > + > + clock-names: > + items: > + - const: ref > + > mdio: > $ref: mdio.yaml > unevaluatedProperties: false > @@ -40,6 +51,17 @@ required: > allOf: > - $ref: /schemas/pci/pci-device.yaml > - $ref: ethernet-controller.yaml > + - if: > + not: > + properties: > + compatible: > + contains: > + enum: > + - pci1131,e101 > + then: > + properties: > + clocks: false > + clock-names: false > > unevaluatedProperties: false > > -- > 2.34.1 >
diff --git a/Documentation/devicetree/bindings/net/fsl,enetc.yaml b/Documentation/devicetree/bindings/net/fsl,enetc.yaml index e152c93998fe..ca70f0050171 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: + oneOf: + - items: + - enum: + - pci1957,e100 + - const: fsl,enetc - enum: - - pci1957,e100 - - const: fsl,enetc + - pci1131,e101 reg: maxItems: 1 + clocks: + items: + - description: MAC transmit/receive reference clock + + clock-names: + items: + - const: ref + mdio: $ref: mdio.yaml unevaluatedProperties: false @@ -40,6 +51,17 @@ required: allOf: - $ref: /schemas/pci/pci-device.yaml - $ref: ethernet-controller.yaml + - if: + not: + properties: + compatible: + contains: + enum: + - pci1131,e101 + then: + properties: + clocks: false + clock-names: false unevaluatedProperties: false
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: Remove "nxp,imx95-enetc" compatible string. v3: 1. Add restriction to "clcoks" and "clock-names" properties and rename the clock, also remove the items from these two properties. 2. Remove unnecessary items for "pci1131,e101" compatible string. v4: Move clocks and clock-names to top level. v5: Add items to clocks and clock-names v6: 1. use negate the 'if' schema (not: contains: ...) --- .../devicetree/bindings/net/fsl,enetc.yaml | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-)