| Message ID | 20241119-upstream_s32cc_gmac-v5-13-7dcc90fcffef@oss.nxp.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v5,01/16] net: driver: stmmac: Fix CSR divider comment | expand |
On Tue, Nov 19, 2024 at 02:39:03PM -0600, Rob Herring wrote: > On Tue, Nov 19, 2024 at 04:00:19PM +0100, Jan Petrous (OSS) wrote: > > Add basic description for DWMAC ethernet IP on NXP S32G2xx, S32G3xx > > and S32R45 automotive series SoCs. > > > > Signed-off-by: Jan Petrous (OSS) <jan.petrous@oss.nxp.com> > > --- > > .../devicetree/bindings/net/nxp,s32-dwmac.yaml | 105 +++++++++++++++++++++ > > .../devicetree/bindings/net/snps,dwmac.yaml | 3 + > > 2 files changed, 108 insertions(+) > > > > diff --git a/Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml b/Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml > > new file mode 100644 > > index 000000000000..a141e826a295 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml > > @@ -0,0 +1,105 @@ > > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > > +# Copyright 2021-2024 NXP > > +%YAML 1.2 > > +--- > > +$id: http://devicetree.org/schemas/net/nxp,s32-dwmac.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: NXP S32G2xx/S32G3xx/S32R45 GMAC ethernet controller > > + > > +maintainers: > > + - Jan Petrous (OSS) <jan.petrous@oss.nxp.com> > > + > > +description: > > + This device is a Synopsys DWC IP, integrated on NXP S32G/R SoCs. > > + The SoC series S32G2xx and S32G3xx feature one DWMAC instance, > > + the SoC S32R45 has two instances. The devices can use RGMII/RMII/MII > > + interface over Pinctrl device or the output can be routed > > + to the embedded SerDes for SGMII connectivity. > > + > > +properties: > > + compatible: > > + oneOf: > > + - const: nxp,s32g2-dwmac > > + - items: > > + - enum: > > + - nxp,s32g3-dwmac > > + - nxp,s32r45-dwmac > > + - const: nxp,s32g2-dwmac > > + > > + reg: > > + items: > > + - description: Main GMAC registers > > + - description: GMAC PHY mode control register > > + > > + interrupts: > > + maxItems: 1 > > + > > + interrupt-names: > > + const: macirq > > + > > + clocks: > > + items: > > + - description: Main GMAC clock > > + - description: Transmit clock > > + - description: Receive clock > > + - description: PTP reference clock > > + > > + clock-names: > > + items: > > + - const: stmmaceth > > + - const: tx > > + - const: rx > > + - const: ptp_ref > > + > > +required: > > + - clocks > > + - clock-names > > + > > +allOf: > > + - $ref: snps,dwmac.yaml# > > + > > +unevaluatedProperties: false > > + > > +examples: > > + - | > > + #include <dt-bindings/interrupt-controller/arm-gic.h> > > + #include <dt-bindings/interrupt-controller/irq.h> > > + #include <dt-bindings/phy/phy.h> > > + bus { > > + #address-cells = <2>; > > + #size-cells = <2>; > > + > > + ethernet@4033c000 { > > + compatible = "nxp,s32g2-dwmac"; > > + reg = <0x0 0x4033c000 0x0 0x2000>, /* gmac IP */ > > + <0x0 0x4007c004 0x0 0x4>; /* GMAC_0_CTRL_STS */ > > + interrupt-parent = <&gic>; > > + interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>; > > + interrupt-names = "macirq"; > > + snps,mtl-rx-config = <&mtl_rx_setup>; > > + snps,mtl-tx-config = <&mtl_tx_setup>; > > + clocks = <&clks 24>, <&clks 17>, <&clks 16>, <&clks 15>; > > + clock-names = "stmmaceth", "tx", "rx", "ptp_ref"; > > + phy-mode = "rgmii-id"; > > + phy-handle = <&phy0>; > > + > > + mtl_rx_setup: rx-queues-config { > > + snps,rx-queues-to-use = <5>; > > + }; > > + > > + mtl_tx_setup: tx-queues-config { > > + snps,tx-queues-to-use = <5>; > > + }; > > + > > + mdio { > > + #address-cells = <1>; > > + #size-cells = <0>; > > + compatible = "snps,dwmac-mdio"; > > + > > + phy0: ethernet-phy@0 { > > + reg = <0>; > > + }; > > + }; > > + }; > > + }; > > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > > index 4e2ba1bf788c..a88d1c236eaf 100644 > > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml > > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > > @@ -66,6 +66,9 @@ properties: > > - ingenic,x2000-mac > > - loongson,ls2k-dwmac > > - loongson,ls7a-dwmac > > + - nxp,s32g2-dwmac > > + - nxp,s32g3-dwmac > > + - nxp,s32r-dwmac > > You really only need to add nxp,s32g2-dwmac since it's always present. Ok, I will remove those two in v6. > > Other than the yamllint issue, > > Reviewed-by: Rob Herring (Arm) <robh@kernel.org> Thanks. /Jan
On Tue, Nov 19, 2024 at 10:24:46AM -0600, Rob Herring (Arm) wrote: > > On Tue, 19 Nov 2024 16:00:19 +0100, Jan Petrous (OSS) wrote: > > Add basic description for DWMAC ethernet IP on NXP S32G2xx, S32G3xx > > and S32R45 automotive series SoCs. > > > > Signed-off-by: Jan Petrous (OSS) <jan.petrous@oss.nxp.com> > > --- > > .../devicetree/bindings/net/nxp,s32-dwmac.yaml | 105 +++++++++++++++++++++ > > .../devicetree/bindings/net/snps,dwmac.yaml | 3 + > > 2 files changed, 108 insertions(+) > > > > My bot found errors running 'make dt_binding_check' on your patch: > > yamllint warnings/errors: > ./Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml:25:9: [warning] wrong indentation: expected 10 but found 8 (indentation) > Thanks, I will fix it in v6. > dtschema/dtc warnings/errors: > > doc reference errors (make refcheckdocs): I have also noticed the refcheckdocs errors, but AFAIK those are not connected to my commit: $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- refcheckdocs Documentation/userspace-api/netlink/netlink-raw.rst: :doc:`rt_link<../../networking/netlink_spec/rt_link>` Documentation/userspace-api/netlink/netlink-raw.rst: :doc:`tc<../../networking/netlink_spec/tc>` Documentation/userspace-api/netlink/netlink-raw.rst: :doc:`tc<../../networking/netlink_spec/tc>` Documentation/devicetree/bindings/nvmem/zii,rave-sp-eeprom.txt: Documentation/devicetree/bindings/mfd/zii,rave-sp.txt Documentation/devicetree/bindings/regulator/siliconmitus,sm5703-regulator.yaml: Documentation/devicetree/bindings/mfd/siliconmitus,sm5703.yaml Documentation/hwmon/g762.rst: Documentation/devicetree/bindings/hwmon/g762.txt Documentation/hwmon/isl28022.rst: Documentation/devicetree/bindings/hwmon/isl,isl28022.yaml Documentation/translations/ja_JP/SubmittingPatches: linux-2.6.12-vanilla/Documentation/dontdiff Documentation/userspace-api/netlink/index.rst: Documentation/networking/netlink_spec/index.rst Documentation/userspace-api/netlink/specs.rst: Documentation/networking/netlink_spec/index.rst MAINTAINERS: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt lib/Kconfig.debug: Documentation/dev-tools/fault-injection/fault-injection.rst > > See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20241119-upstream_s32cc_gmac-v5-13-7dcc90fcffef@oss.nxp.com > > The base for the series is generally the latest rc1. A different dependency > should be noted in *this* patch. I have series based on v6.12 and I don't see there any v6.13-rc1. > > If you already ran 'make dt_binding_check' and didn't see the above > error(s), then make sure 'yamllint' is installed and dt-schema is up to > date: > > pip3 install dtschema --upgrade > > Please check and re-submit after running the above command yourself. Note > that DT_SCHEMA_FILES can be set to your schema file to speed up checking > your schema. However, it must be unset to test all examples with your schema. > I rechecked with fixed indentation, no any error was found. BR. /Jan
diff --git a/Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml b/Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml new file mode 100644 index 000000000000..a141e826a295 --- /dev/null +++ b/Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml @@ -0,0 +1,105 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright 2021-2024 NXP +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/nxp,s32-dwmac.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NXP S32G2xx/S32G3xx/S32R45 GMAC ethernet controller + +maintainers: + - Jan Petrous (OSS) <jan.petrous@oss.nxp.com> + +description: + This device is a Synopsys DWC IP, integrated on NXP S32G/R SoCs. + The SoC series S32G2xx and S32G3xx feature one DWMAC instance, + the SoC S32R45 has two instances. The devices can use RGMII/RMII/MII + interface over Pinctrl device or the output can be routed + to the embedded SerDes for SGMII connectivity. + +properties: + compatible: + oneOf: + - const: nxp,s32g2-dwmac + - items: + - enum: + - nxp,s32g3-dwmac + - nxp,s32r45-dwmac + - const: nxp,s32g2-dwmac + + reg: + items: + - description: Main GMAC registers + - description: GMAC PHY mode control register + + interrupts: + maxItems: 1 + + interrupt-names: + const: macirq + + clocks: + items: + - description: Main GMAC clock + - description: Transmit clock + - description: Receive clock + - description: PTP reference clock + + clock-names: + items: + - const: stmmaceth + - const: tx + - const: rx + - const: ptp_ref + +required: + - clocks + - clock-names + +allOf: + - $ref: snps,dwmac.yaml# + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/phy/phy.h> + bus { + #address-cells = <2>; + #size-cells = <2>; + + ethernet@4033c000 { + compatible = "nxp,s32g2-dwmac"; + reg = <0x0 0x4033c000 0x0 0x2000>, /* gmac IP */ + <0x0 0x4007c004 0x0 0x4>; /* GMAC_0_CTRL_STS */ + interrupt-parent = <&gic>; + interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "macirq"; + snps,mtl-rx-config = <&mtl_rx_setup>; + snps,mtl-tx-config = <&mtl_tx_setup>; + clocks = <&clks 24>, <&clks 17>, <&clks 16>, <&clks 15>; + clock-names = "stmmaceth", "tx", "rx", "ptp_ref"; + phy-mode = "rgmii-id"; + phy-handle = <&phy0>; + + mtl_rx_setup: rx-queues-config { + snps,rx-queues-to-use = <5>; + }; + + mtl_tx_setup: tx-queues-config { + snps,tx-queues-to-use = <5>; + }; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + compatible = "snps,dwmac-mdio"; + + phy0: ethernet-phy@0 { + reg = <0>; + }; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 4e2ba1bf788c..a88d1c236eaf 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -66,6 +66,9 @@ properties: - ingenic,x2000-mac - loongson,ls2k-dwmac - loongson,ls7a-dwmac + - nxp,s32g2-dwmac + - nxp,s32g3-dwmac + - nxp,s32r-dwmac - qcom,qcs404-ethqos - qcom,sa8775p-ethqos - qcom,sc8280xp-ethqos