Skip to contentSkip to conversation

arm64: dts: mt8195: Add Ethernet controller

PATCH RESEND Superseded Biao Huang 3 participants 6 messages Dec 21, 2022 – Dec 22, 2022

Subsystems (2)

v4 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Biao Huang

author
#0 lore raw

v4 cover arm64: dts: mt8195: Add Ethernet controller

Resend v4, please review it, thanks~

Changes in v4:
1. remove {address,size}-cells = <0> to avoid warning as Angelo's feedback.
2. Add reviewd-by as Angelo's comments.

Changes in v3:
1. move stmmac-axi-config, rx-queues-config, tx-queues-configs inside ethernet node as Angelo's comments.
2. add {address,size}-cells = <0> in ethernet node as Angelo's comments.

Changes in v2:
1. modify pinctrl node used by ethernet to match rules in pinctrl-mt8195.yaml, which is pointed by Krzysztof.
2. remove "mac-address" property in ethernet node as comments of Krzysztof.

Changes in v1:
add dts node for MT8195 Ethernet controller

Biao Huang (1):
arm64: dts: mt8195: Add Ethernet controller

 arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 88 ++++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt8195.dtsi     | 86 +++++++++++++++++++
 2 files changed, 174 insertions(+)
Signature · 1 line
2.18.0
author
#1 lore raw

PATCH RESEND v4 1/1 arm64: dts: mt8195: Add Ethernet controller

Add Ethernet controller node for mt8195.

---
 arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 88 ++++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt8195.dtsi     | 86 +++++++++++++++++++
 2 files changed, 174 insertions(+)
arch/arm64/boot/dts/mediatek/mt8195-demo.dts +88 -0
index 4fbd99eb496a..0e8496d837ef 100644
@@ -258,6 +258,72 @@ &mt6359_vsram_others_ldo_reg {
 };
 
 &pio {
+	eth_default_pins: eth-default-pins {
+		pins-txd {
+			pinmux = <PINMUX_GPIO77__FUNC_GBE_TXD3>,
+				 <PINMUX_GPIO78__FUNC_GBE_TXD2>,
+				 <PINMUX_GPIO79__FUNC_GBE_TXD1>,
+				 <PINMUX_GPIO80__FUNC_GBE_TXD0>;
+			drive-strength = <MTK_DRIVE_8mA>;
+		};
+		pins-cc {
+			pinmux = <PINMUX_GPIO85__FUNC_GBE_TXC>,
+				 <PINMUX_GPIO88__FUNC_GBE_TXEN>,
+				 <PINMUX_GPIO87__FUNC_GBE_RXDV>,
+				 <PINMUX_GPIO86__FUNC_GBE_RXC>;
+			drive-strength = <MTK_DRIVE_8mA>;
+		};
+		pins-rxd {
+			pinmux = <PINMUX_GPIO81__FUNC_GBE_RXD3>,
+				 <PINMUX_GPIO82__FUNC_GBE_RXD2>,
+				 <PINMUX_GPIO83__FUNC_GBE_RXD1>,
+				 <PINMUX_GPIO84__FUNC_GBE_RXD0>;
+		};
+		pins-mdio {
+			pinmux = <PINMUX_GPIO89__FUNC_GBE_MDC>,
+				 <PINMUX_GPIO90__FUNC_GBE_MDIO>;
+			input-enable;
+		};
+		pins-power {
+			pinmux = <PINMUX_GPIO91__FUNC_GPIO91>,
+				 <PINMUX_GPIO92__FUNC_GPIO92>;
+			output-high;
+		};
+	};
+
+	eth_sleep_pins: eth-sleep-pins {
+		pins-txd {
+			pinmux = <PINMUX_GPIO77__FUNC_GPIO77>,
+				 <PINMUX_GPIO78__FUNC_GPIO78>,
+				 <PINMUX_GPIO79__FUNC_GPIO79>,
+				 <PINMUX_GPIO80__FUNC_GPIO80>;
+		};
+		pins-cc {
+			pinmux = <PINMUX_GPIO85__FUNC_GPIO85>,
+				 <PINMUX_GPIO88__FUNC_GPIO88>,
+				 <PINMUX_GPIO87__FUNC_GPIO87>,
+				 <PINMUX_GPIO86__FUNC_GPIO86>;
+		};
+		pins-rxd {
+			pinmux = <PINMUX_GPIO81__FUNC_GPIO81>,
+				 <PINMUX_GPIO82__FUNC_GPIO82>,
+				 <PINMUX_GPIO83__FUNC_GPIO83>,
+				 <PINMUX_GPIO84__FUNC_GPIO84>;
+		};
+		pins-mdio {
+			pinmux = <PINMUX_GPIO89__FUNC_GPIO89>,
+				 <PINMUX_GPIO90__FUNC_GPIO90>;
+			input-disable;
+			bias-disable;
+		};
+		pins-power {
+			pinmux = <PINMUX_GPIO91__FUNC_GPIO91>,
+				 <PINMUX_GPIO92__FUNC_GPIO92>;
+			input-disable;
+			bias-disable;
+		};
+	};
+
 	gpio_keys_pins: gpio-keys-pins {
 		pins {
 			pinmux = <PINMUX_GPIO106__FUNC_GPIO106>;
@@ -434,6 +500,28 @@ &xhci0 {
 	status = "okay";
 };
 
+&eth {
+	phy-mode ="rgmii-rxid";
+	phy-handle = <&ethernet_phy0>;
+	snps,reset-gpio = <&pio 93 GPIO_ACTIVE_HIGH>;
+	snps,reset-delays-us = <0 10000 10000>;
+	mediatek,tx-delay-ps = <2030>;
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&eth_default_pins>;
+	pinctrl-1 = <&eth_sleep_pins>;
+	status = "okay";
+
+	mdio {
+		compatible = "snps,dwmac-mdio";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		ethernet_phy0: ethernet-phy@1 {
+			compatible = "ethernet-phy-id001c.c916";
+			reg = <0x1>;
+		};
+	};
+};
+
 &xhci1 {
 	vusb33-supply = <&mt6359_vusb_ldo_reg>;
 	status = "okay";
arch/arm64/boot/dts/mediatek/mt8195.dtsi +86 -0

92 lines not on this page · raw message

Signature · 1 line
2.25.1
#2 lore raw

Il 21/12/22 03:25, Biao Huang ha scritto:

Quoted 8 lines

Add Ethernet controller node for mt8195.

---
  arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 88 ++++++++++++++++++++
  arch/arm64/boot/dts/mediatek/mt8195.dtsi     | 86 +++++++++++++++++++
  2 files changed, 174 insertions(+)

..snip..

Quoted 6 lines
arch/arm64/boot/dts/mediatek/mt8195.dtsi +0 -0
index 5d31536f4c48..02112bbf2bdf 100644
@@ -1046,6 +1046,92 @@ spis1: spi@1101e000 {
  			status = "disabled";

arch/arm64/boot/dts/mediatek/mt8195.dtsi spis1: spi@1101e000 { · line 1056

Quoted 10 lines
arch/arm64/boot/dts/mediatek/mt8195.dtsi +8 -0
  		};
 
+		eth: ethernet@11021000 {
+			compatible = "mediatek,mt8195-gmac", "snps,dwmac-5.10a";
+			reg = <0 0x11021000 0 0x4000>;
+			interrupts = <GIC_SPI 716 IRQ_TYPE_LEVEL_HIGH 0>;
+			interrupt-names = "macirq";
+			clock-names = "axi",
+				      "apb",
+				      "mac_cg",

mac_cg goes as last clock, as specified in the binding.

Order: axi, apb, mac_main, ptp_ref, rmii_internal, mac_cg.

Please fix.

Regards,
Angelo

Quoted 9 lines
arch/arm64/boot/dts/mediatek/mt8195.dtsi +9 -0
+				      "mac_main",
+				      "ptp_ref",
+				      "rmii_internal";
+			clocks = <&pericfg_ao CLK_PERI_AO_ETHERNET>,
+				 <&pericfg_ao CLK_PERI_AO_ETHERNET_BUS>,
+				 <&pericfg_ao CLK_PERI_AO_ETHERNET_MAC>,
+				 <&topckgen CLK_TOP_SNPS_ETH_250M>,
+				 <&topckgen CLK_TOP_SNPS_ETH_62P4M_PTP>,
+				 <&topckgen CLK_TOP_SNPS_ETH_50M_RMII>;
#3 lore raw

Dear Angelo,
Thanks for your comments!

Quoted 36 lines · AngeloGioacchino Del Regno

Il 21/12/22 03:25, Biao Huang ha scritto:

Quoted 10 lines

Add Ethernet controller node for mt8195.

---
  arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 88
++++++++++++++++++++
  arch/arm64/boot/dts/mediatek/mt8195.dtsi     | 86
+++++++++++++++++++
  2 files changed, 174 insertions(+)

..snip..

Quoted 9 lines
arch/arm64/boot/dts/mediatek/mt8195.dtsi +0 -0
index 5d31536f4c48..02112bbf2bdf 100644
@@ -1046,6 +1046,92 @@ spis1: spi@1101e000 {
  			status = "disabled";
  		};
 

arch/arm64/boot/dts/mediatek/mt8195.dtsi spis1: spi@1101e000 { · line 1058

Quoted 10 lines
arch/arm64/boot/dts/mediatek/mt8195.dtsi +8 -0
+		eth: ethernet@11021000 {
+			compatible = "mediatek,mt8195-gmac",
 "snps,dwmac-5.10a";
+			reg = <0 0x11021000 0 0x4000>;
+			interrupts = <GIC_SPI 716 IRQ_TYPE_LEVEL_HIGH
 0>;
+			interrupt-names = "macirq";
+			clock-names = "axi",
+				      "apb",
+				      "mac_cg",

mac_cg goes as last clock, as specified in the binding.

Quoted 3 lines

Order: axi, apb, mac_main, ptp_ref, rmii_internal, mac_cg.

Please fix.

OK, will fix in next send.

Quoted 18 lines

Regards,
Angelo

Quoted 12 lines
arch/arm64/boot/dts/mediatek/mt8195.dtsi +6 -0
+				      "mac_main",
+				      "ptp_ref",
+				      "rmii_internal";
+			clocks = <&pericfg_ao CLK_PERI_AO_ETHERNET>,
+				 <&pericfg_ao
 CLK_PERI_AO_ETHERNET_BUS>,
+				 <&pericfg_ao

CLK_PERI_AO_ETHERNET_MAC>,

arch/arm64/boot/dts/mediatek/mt8195.dtsi +2 -0
+				 <&topckgen CLK_TOP_SNPS_ETH_250M>,
+				 <&topckgen

CLK_TOP_SNPS_ETH_62P4M_PTP>,

arch/arm64/boot/dts/mediatek/mt8195.dtsi +1 -0
+				 <&topckgen CLK_TOP_SNPS_ETH_50M_RMII>;
#4 lore raw
In reply to Biao Huang

arch/arm64/boot/dts/mediatek/mt8195-demo.dts &xhci0 { · line 504

Quoted 2 lines

+&eth {

arch/arm64/boot/dts/mediatek/mt8195-demo.dts +1 -0
+	phy-mode ="rgmii-rxid";

That is pretty unusual. You don't see rxid, or txid very often, it is normally rgmii, or rgmii-id.

arch/arm64/boot/dts/mediatek/mt8195-demo.dts &xhci0 { · line 508

Quoted 4 lines
arch/arm64/boot/dts/mediatek/mt8195-demo.dts +4 -0
+	phy-handle = <&ethernet_phy0>;
+	snps,reset-gpio = <&pio 93 GPIO_ACTIVE_HIGH>;
+	snps,reset-delays-us = <0 10000 10000>;
+	mediatek,tx-delay-ps = <2030>;

How important is the 30 here?

You appear to have the PHY doing the RX delay, and the MAC doing the TX delay. Normally we have the PHY do both. Can you actually do

phy-mode = "rgmii-id", and mediatek,tx-delay-ps = <30> ? That would then have the PHY doing the basic 2ns delay, and the MAC doing the fine tuning needed for TX?

Andrew

#5 lore raw

Dear Andrew,
Thanks for your comments~

Quoted 5 lines · Andrew Lunn

arch/arm64/boot/dts/mediatek/mt8195-demo.dts &xhci0 { · line 504

Quoted 2 lines

+&eth {

arch/arm64/boot/dts/mediatek/mt8195-demo.dts +1 -0
+	phy-mode ="rgmii-rxid";

That is pretty unusual. You don't see rxid, or txid very often, it is normally rgmii, or rgmii-id.

We didn't notice that, and in our design, we can ensure 2ns delay in tx direction, so we pick rgmii-rxid.
Theoretically, we should support all the cases, and we'll set phy-mode to "rgmii-id" in next send.

Quoted 7 lines

arch/arm64/boot/dts/mediatek/mt8195-demo.dts &xhci0 { · line 508

Quoted 5 lines
arch/arm64/boot/dts/mediatek/mt8195-demo.dts +4 -0
+	phy-handle = <&ethernet_phy0>;
+	snps,reset-gpio = <&pio 93 GPIO_ACTIVE_HIGH>;
+	snps,reset-delays-us = <0 10000 10000>;
+	mediatek,tx-delay-ps = <2030>;

How important is the 30 here?

As documented in yaml, "For MT8188/MT8195 RGMII/RMII/MII interface, Allowed value need to be a multiple of 290, or will round down. Range 0~31*290.
"
so the 2030 is chosen here.

Quoted 7 lines

You appear to have the PHY doing the RX delay, and the MAC doing the TX delay. Normally we have the PHY do both. Can you actually do

phy-mode = "rgmii-id", and mediatek,tx-delay-ps = <30> ? That would then have the PHY doing the basic 2ns delay, and the MAC doing the fine tuning needed for TX?

Yes, we can do phy-mode = "rgmii-id".
DTS and driver modification will send together in next send. Thanks for your valuable comments~

Quoted 2 lines

Andrew