From 10c6f5b872e308d886e34fce7ac2320e097a9524 Mon Sep 17 00:00:00 2001 From: padavanonly Date: Thu, 19 Sep 2024 03:33:58 +0800 Subject: [PATCH] Revert "mtk eth soc:revert label setting" This reverts commit f4e1f8f929d02bcb6f6de2d11096500466b6fd6c. --- .../boot/dts/mediatek/mt7981-abt-asr3000.dts | 2 +- .../dts/mediatek/mt7981-clt-r30b1-base.dtsi | 2 +- .../boot/dts/mediatek/mt7981-cmcc-a10.dts | 12 ---------- .../dts/mediatek/mt7981-cmcc-rax3000m.dtsi | 2 +- .../boot/dts/mediatek/mt7981-h3c-nx30pro.dts | 2 +- .../dts/mediatek/mt7981-imou_lc-hx3001.dts | 2 +- .../dts/mediatek/mt7981-konka-komi-a31.dts | 2 +- .../boot/dts/mediatek/mt7981-zr-3020.dts | 23 +++++++++---------- .../mt7986a-bananapi-bpi-r3mini-emmc.dts | 2 +- .../dts/mediatek/mt7986a-glinet-gl-mt6000.dts | 2 +- .../dts/mediatek/mt7986a-jdcloud-re-cp-03.dts | 2 +- .../boot/dts/mediatek/mt7986a-netcore-n60.dts | 2 +- .../mediatek/mt7986a-ruijie-rg-x60-pro.dtsi | 2 +- .../dts/mediatek/mt7986a-tl-xdr-common.dtsi | 2 +- .../net/ethernet/mediatek/mtk_hnat/hnat.c | 2 +- .../mt7981/base-files/etc/board.d/02_network | 14 +++++------ .../mt7986/base-files/etc/board.d/02_network | 10 ++++---- 17 files changed, 36 insertions(+), 49 deletions(-) diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-abt-asr3000.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-abt-asr3000.dts index 53ec161dee..7b7167b499 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-abt-asr3000.dts +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-abt-asr3000.dts @@ -139,7 +139,7 @@ gmac1: mac@1 { compatible = "mediatek,eth-mac"; - + label = "wan"; reg = <1>; phy-mode = "gmii"; phy-handle = <&phy0>; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-clt-r30b1-base.dtsi b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-clt-r30b1-base.dtsi index 60db28307b..7b6a237ae8 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-clt-r30b1-base.dtsi +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-clt-r30b1-base.dtsi @@ -149,7 +149,7 @@ gmac1: mac@1 { compatible = "mediatek,eth-mac"; - + label = "wan"; reg = <1>; phy-mode = "gmii"; phy-handle = <&phy0>; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-cmcc-a10.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-cmcc-a10.dts index bbdb97251c..8a191aabdc 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-cmcc-a10.dts +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-cmcc-a10.dts @@ -119,18 +119,6 @@ pause; }; }; - - gmac1: mac@1 { - compatible = "mediatek,eth-mac"; - reg = <1>; - phy-mode = "2500base-x"; - - fixed-link { - speed = <2500>; - full-duplex; - pause; - }; - }; mdio: mdio-bus { diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-cmcc-rax3000m.dtsi b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-cmcc-rax3000m.dtsi index c1378c7667..79b65baaa6 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-cmcc-rax3000m.dtsi +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-cmcc-rax3000m.dtsi @@ -76,7 +76,7 @@ gmac1: mac@1 { compatible = "mediatek,eth-mac"; - + label = "wan"; reg = <1>; phy-mode = "gmii"; phy-handle = <&phy0>; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-h3c-nx30pro.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-h3c-nx30pro.dts index 91b7a75ea8..b7fc8ca2aa 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-h3c-nx30pro.dts +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-h3c-nx30pro.dts @@ -141,7 +141,7 @@ gmac1: mac@1 { compatible = "mediatek,eth-mac"; - + label = "wan"; reg = <1>; phy-mode = "gmii"; phy-handle = <&phy0>; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-imou_lc-hx3001.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-imou_lc-hx3001.dts index 2a71157c2f..eacb39034e 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-imou_lc-hx3001.dts +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-imou_lc-hx3001.dts @@ -134,7 +134,7 @@ gmac1: mac@1 { compatible = "mediatek,eth-mac"; - + label = "wan"; reg = <1>; phy-mode = "gmii"; phy-handle = <&phy0>; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-konka-komi-a31.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-konka-komi-a31.dts index 279141434b..38d80413a7 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-konka-komi-a31.dts +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-konka-komi-a31.dts @@ -126,7 +126,7 @@ gmac1: mac@1 { compatible = "mediatek,eth-mac"; - + label = "wan"; reg = <1>; phy-mode = "gmii"; phy-handle = <&phy0>; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-zr-3020.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-zr-3020.dts index ec0f676b0b..c69e341a35 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-zr-3020.dts +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-zr-3020.dts @@ -162,24 +162,23 @@ pause; }; }; - - gmac1: mac@1 { - compatible = "mediatek,eth-mac"; - reg = <1>; - phy-mode = "2500base-x"; - - fixed-link { - speed = <2500>; - full-duplex; - pause; - }; - }; mdio: mdio-bus { #address-cells = <1>; #size-cells = <0>; + phy5: phy@5 { + compatible = "ethernet-phy-id67c9.de0a"; + reg = <5>; + phy-mode = "2500base-x"; + }; + phy6: phy@6 { + compatible = "ethernet-phy-id67c9.de0a"; + reg = <6>; + phy-mode = "2500base-x"; + }; + switch@0 { compatible = "mediatek,mt7531"; reg = <31>; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts index a1fe68efa1..e18ebc2d05 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts @@ -202,7 +202,7 @@ }; gmac1: mac@1 { - + label = "wan"; compatible = "mediatek,eth-mac"; reg = <1>; phy-mode = "2500base-x"; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-glinet-gl-mt6000.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-glinet-gl-mt6000.dts index 2f579025ae..82a51b97b2 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-glinet-gl-mt6000.dts +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-glinet-gl-mt6000.dts @@ -153,7 +153,7 @@ }; gmac1: mac@1 { - + label = "wan"; compatible = "mediatek,eth-mac"; reg = <1>; phy-mode = "2500base-x"; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-jdcloud-re-cp-03.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-jdcloud-re-cp-03.dts index b595726155..3f51e33512 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-jdcloud-re-cp-03.dts +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-jdcloud-re-cp-03.dts @@ -99,7 +99,7 @@ }; gmac1: mac@1 { - + label = "wan"; compatible = "mediatek,eth-mac"; reg = <1>; phy-mode = "2500base-x"; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-netcore-n60.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-netcore-n60.dts index 7b0df7439b..7653ab62cd 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-netcore-n60.dts +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-netcore-n60.dts @@ -117,7 +117,7 @@ }; gmac1: mac@1 { - + label = "wan"; compatible = "mediatek,eth-mac"; reg = <1>; phy-mode = "2500base-x"; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-pro.dtsi b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-pro.dtsi index bc720685f2..3fdd8afed4 100644 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-pro.dtsi +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-pro.dtsi @@ -75,7 +75,7 @@ }; gmac1: mac@1 { - + label = "wan"; compatible = "mediatek,eth-mac"; reg = <1>; phy-mode = "2500base-x"; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-tl-xdr-common.dtsi b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-tl-xdr-common.dtsi index 09315822db..d6d4973de5 100755 --- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-tl-xdr-common.dtsi +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-tl-xdr-common.dtsi @@ -90,7 +90,7 @@ }; gmac1: mac@1 { - + label = "wan"; compatible = "mediatek,eth-mac"; reg = <1>; phy-mode = "2500base-x"; diff --git a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.c b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.c index 21af01c375..e43905209b 100644 --- a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.c +++ b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.c @@ -710,7 +710,7 @@ static int hnat_probe(struct platform_device *pdev) err = of_property_read_string(np, "mtketh-ppd", &name); if (err < 0) - strncpy(hnat_priv->ppd, "eth1", IFNAMSIZ); + strncpy(hnat_priv->ppd, "wan", IFNAMSIZ); else strncpy(hnat_priv->ppd, (char *)name, IFNAMSIZ - 1); dev_info(&pdev->dev, "ppd = %s\n", hnat_priv->ppd); diff --git a/target/linux/mediatek/mt7981/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7981/base-files/etc/board.d/02_network index 42c03b2b91..330ffb57d1 100755 --- a/target/linux/mediatek/mt7981/base-files/etc/board.d/02_network +++ b/target/linux/mediatek/mt7981/base-files/etc/board.d/02_network @@ -20,11 +20,11 @@ mediatek_setup_interfaces() "0:lan" "1:lan" "2:lan" "3:lan" "4:lan" "6u@eth0" ;; *2500wan-p5*) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 eth1" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan ;; xiaomi,mi-router-ax3000t* |\ xiaomi,mi-router-wr30u*) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan ;; *360,t7*) ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan @@ -36,20 +36,20 @@ mediatek_setup_interfaces() h3c,nx30pro |\ *imou,lc-hx3001* |\ *konka,komi-a31*) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1 + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan ;; *cmcc,a10*) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan ;; *jcg,q30*) ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan ;; abt,asr3000 |\ *rax3000m*) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1 + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan ;; *nokia,ea0326gmp*) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1 + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan ;; *mt3000* |\ glinet,x3000-emmc |\ @@ -58,7 +58,7 @@ mediatek_setup_interfaces() ucidef_set_interfaces_lan_wan "eth1" "eth0" ;; *zr-3020*) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan ;; nradio,wt9103) ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" eth1 diff --git a/target/linux/mediatek/mt7986/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7986/base-files/etc/board.d/02_network index 1d26f2bc0d..ee1ef3323c 100755 --- a/target/linux/mediatek/mt7986/base-files/etc/board.d/02_network +++ b/target/linux/mediatek/mt7986/base-files/etc/board.d/02_network @@ -27,19 +27,19 @@ mediatek_setup_interfaces() ;; netcore,n60 |\ ruijie,rg-x60-pro*) - ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" eth1 + ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" wan ;; glinet,gl-mt6000) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1 + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" wan ;; jdcloud,re-cp-03) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" eth1 + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan ;; tplink,tl-xdr6086) - ucidef_set_interfaces_lan_wan "lan1 lan2" eth1 + ucidef_set_interfaces_lan_wan "lan1 lan2" wan ;; tplink,tl-xdr6088) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1 + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" wan ;; *) ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3 lan4 lan5" eth1