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 7b7167b499..53ec161dee 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 7b6a237ae8..60db28307b 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 8a191aabdc..bbdb97251c 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,6 +119,18 @@ 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 79b65baaa6..c1378c7667 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 b7fc8ca2aa..91b7a75ea8 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 eacb39034e..2a71157c2f 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 38d80413a7..279141434b 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 c69e341a35..ec0f676b0b 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,23 +162,24 @@ 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 e18ebc2d05..a1fe68efa1 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 82a51b97b2..2f579025ae 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 3f51e33512..b595726155 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 7653ab62cd..7b0df7439b 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 3fdd8afed4..bc720685f2 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 d6d4973de5..09315822db 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 e43905209b..21af01c375 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, "wan", IFNAMSIZ); + strncpy(hnat_priv->ppd, "eth1", 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 330ffb57d1..42c03b2b91 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" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 eth1" wan ;; xiaomi,mi-router-ax3000t* |\ xiaomi,mi-router-wr30u*) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" 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" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1 ;; *cmcc,a10*) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan ;; *jcg,q30*) ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan ;; abt,asr3000 |\ *rax3000m*) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1 ;; *nokia,ea0326gmp*) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1 ;; *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" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" 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 ee1ef3323c..1d26f2bc0d 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" wan + ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" eth1 ;; glinet,gl-mt6000) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1 ;; jdcloud,re-cp-03) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" eth1 ;; tplink,tl-xdr6086) - ucidef_set_interfaces_lan_wan "lan1 lan2" wan + ucidef_set_interfaces_lan_wan "lan1 lan2" eth1 ;; tplink,tl-xdr6088) - ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" wan + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" eth1 ;; *) ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3 lan4 lan5" eth1