| Message ID | 20241024065328.521518-3-wei.fang@nxp.com |
|---|---|
| State | Changes Requested |
| 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 Thu, Oct 24, 2024 at 02:53:17PM +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: 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 > --- > .../devicetree/bindings/net/fsl,enetc.yaml | 34 +++++++++++++++++-- > 1 file changed, 31 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/fsl,enetc.yaml b/Documentation/devicetree/bindings/net/fsl,enetc.yaml > index e152c93998fe..72d2d5d285cd 100644 > --- a/Documentation/devicetree/bindings/net/fsl,enetc.yaml > +++ b/Documentation/devicetree/bindings/net/fsl,enetc.yaml > @@ -20,14 +20,23 @@ maintainers: > > properties: > compatible: > - items: > + oneOf: > + - items: > + - enum: > + - pci1957,e100 > + - const: fsl,enetc > - enum: > - - pci1957,e100 > - - const: fsl,enetc > + - pci1131,e101 > > reg: > maxItems: 1 > > + clocks: > + maxItems: 1 > + > + clock-names: > + maxItems: 1 > + > mdio: > $ref: mdio.yaml > unevaluatedProperties: false > @@ -40,6 +49,25 @@ required: > allOf: > - $ref: /schemas/pci/pci-device.yaml > - $ref: ethernet-controller.yaml > + - if: > + properties: > + compatible: > + contains: > + enum: > + - pci1131,e101 > + then: > + properties: > + clocks: > + items: > + - description: MAC transmit/receiver reference clock This goes in the top-level or can just be dropped. > + > + clock-names: > + items: > + - const: ref This goes in the top-level. > + else: Then negate the 'if' schema (not: contains: ...) and you just need the part below: > + properties: > + clocks: false > + clock-names: false > > unevaluatedProperties: false > > -- > 2.34.1 >
> > On Thu, Oct 24, 2024 at 02:53:17PM +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: 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 > > --- > > .../devicetree/bindings/net/fsl,enetc.yaml | 34 +++++++++++++++++-- > > 1 file changed, 31 insertions(+), 3 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/net/fsl,enetc.yaml > > b/Documentation/devicetree/bindings/net/fsl,enetc.yaml > > index e152c93998fe..72d2d5d285cd 100644 > > --- a/Documentation/devicetree/bindings/net/fsl,enetc.yaml > > +++ b/Documentation/devicetree/bindings/net/fsl,enetc.yaml > > @@ -20,14 +20,23 @@ maintainers: > > > > properties: > > compatible: > > - items: > > + oneOf: > > + - items: > > + - enum: > > + - pci1957,e100 > > + - const: fsl,enetc > > - enum: > > - - pci1957,e100 > > - - const: fsl,enetc > > + - pci1131,e101 > > > > reg: > > maxItems: 1 > > > > + clocks: > > + maxItems: 1 > > + > > + clock-names: > > + maxItems: 1 > > + > > mdio: > > $ref: mdio.yaml > > unevaluatedProperties: false > > @@ -40,6 +49,25 @@ required: > > allOf: > > - $ref: /schemas/pci/pci-device.yaml > > - $ref: ethernet-controller.yaml > > + - if: > > + properties: > > + compatible: > > + contains: > > + enum: > > + - pci1131,e101 > > + then: > > + properties: > > + clocks: > > + items: > > + - description: MAC transmit/receiver reference clock > > This goes in the top-level or can just be dropped. > > > + > > + clock-names: > > + items: > > + - const: ref > > This goes in the top-level. > > > > + else: > > Then negate the 'if' schema (not: contains: ...) and you just need the part > below: Okay, I'll improve it, many thanks. > > > + 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..72d2d5d285cd 100644 --- a/Documentation/devicetree/bindings/net/fsl,enetc.yaml +++ b/Documentation/devicetree/bindings/net/fsl,enetc.yaml @@ -20,14 +20,23 @@ maintainers: properties: compatible: - items: + oneOf: + - items: + - enum: + - pci1957,e100 + - const: fsl,enetc - enum: - - pci1957,e100 - - const: fsl,enetc + - pci1131,e101 reg: maxItems: 1 + clocks: + maxItems: 1 + + clock-names: + maxItems: 1 + mdio: $ref: mdio.yaml unevaluatedProperties: false @@ -40,6 +49,25 @@ required: allOf: - $ref: /schemas/pci/pci-device.yaml - $ref: ethernet-controller.yaml + - if: + properties: + compatible: + contains: + enum: + - pci1131,e101 + then: + properties: + clocks: + items: + - description: MAC transmit/receiver reference clock + + clock-names: + items: + - const: ref + else: + 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 --- .../devicetree/bindings/net/fsl,enetc.yaml | 34 +++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-)