Dear Matthias,
	Thanks for your comments~
On Wed, 2021-12-15 at 20:22 +0100, Matthias Brugger wrote:

On 10/12/2021 02:31, Biao Huang wrote:

quoted

Since there are some changes in ethernet driver,
update ethernet device node in dts to accommodate to it.

I have a hard time to understand how the first two patches are
related to this 
one. Please be more specific in your commit message.

This dts patch is not related to previous two patches in this series.

Actually, this patch should be sent with commit
"71a55a2315b047352b3d65e2d24724207be85ae2", which added extra RMII
support in driver. But unfortunately, we missed it out.

Is there any proper way to relate this patch to commit
"71a55a2315b047352b3d65e2d24724207be85ae2"? (Fixed tag seems not a good
choice, or just add more details in commit message?)

 
Also please beware that we should make sure that a newer driver
version should 
still work properly with an older device tree, which does not have
your changes.

Regards,
Matthias

quoted

Signed-off-by: Biao Huang <redacted>
---
  arch/arm64/boot/dts/mediatek/mt2712-evb.dts |  1 +
  arch/arm64/boot/dts/mediatek/mt2712e.dtsi   | 14 +++++++++-----
  2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/mediatek/mt2712-evb.dts

b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts
index 7d369fdd3117..11aa135aa0f3 100644

--- a/arch/arm64/boot/dts/mediatek/mt2712-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts

@@ -110,6 +110,7 @@ &eth {
  	phy-handle = <&ethernet_phy0>;
  	mediatek,tx-delay-ps = <1530>;
  	snps,reset-gpio = <&pio 87 GPIO_ACTIVE_LOW>;
+	snps,reset-delays-us = <0 10000 10000>;
  	pinctrl-names = "default", "sleep";
  	pinctrl-0 = <&eth_default>;
  	pinctrl-1 = <&eth_sleep>;

diff --git a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi

b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
index a9cca9c146fd..9e850e04fffb 100644

--- a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi

@@ -726,7 +726,7 @@ queue2 {
  	};
  
  	eth: ethernet@1101c000 {
-		compatible = "mediatek,mt2712-gmac";
+		compatible = "mediatek,mt2712-gmac", "snps,dwmac-

4.20a";
  		reg = <0 0x1101c000 0 0x1300>;
  		interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_LOW>;
  		interrupt-names = "macirq";

@@ -734,15 +734,19 @@ eth: ethernet@1101c000 {
  		clock-names = "axi",
  			      "apb",
  			      "mac_main",
-			      "ptp_ref";
+			      "ptp_ref",
+			      "rmii_internal";
  		clocks = <&pericfg CLK_PERI_GMAC>,
  			 <&pericfg CLK_PERI_GMAC_PCLK>,
  			 <&topckgen CLK_TOP_ETHER_125M_SEL>,
-			 <&topckgen CLK_TOP_ETHER_50M_SEL>;
+			 <&topckgen CLK_TOP_ETHER_50M_SEL>,
+			 <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>;
  		assigned-clocks = <&topckgen CLK_TOP_ETHER_125M_SEL>,
-				  <&topckgen CLK_TOP_ETHER_50M_SEL>;
+				  <&topckgen CLK_TOP_ETHER_50M_SEL>,
+				  <&topckgen

CLK_TOP_ETHER_50M_RMII_SEL>;
  		assigned-clock-parents = <&topckgen
CLK_TOP_ETHERPLL_125M>,
-					 <&topckgen CLK_TOP_APLL1_D3>;
+					 <&topckgen CLK_TOP_APLL1_D3>,
+					 <&topckgen
CLK_TOP_ETHERPLL_50M>;
  		power-domains = <&scpsys MT2712_POWER_DOMAIN_AUDIO>;
  		mediatek,pericfg = <&pericfg>;
  		snps,axi-config = <&stmmac_axi_setup>;

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel