him411/immortalwrt-mt798x-padavanonly
1
0
Fork 0
mirror of https://github.com/padavanonly/immortalwrt-mt798x.git synced 2025-12-16 16:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "mtk eth soc:revert label setting"

Browse Source 
This reverts commit f4e1f8f929.
This commit is contained in:
padavanonly 2024-09-19 03:33:58 +08:00
parent f4e1f8f929
commit 10c6f5b872
17 changed files with 36 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-abt-asr3000.dts
View File

@ -139,7 +139,7 @@
gmac1: mac@1 { gmac1: mac@1 {
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
label = "wan";
reg = <1>; reg = <1>;
phy-mode = "gmii"; phy-mode = "gmii";
phy-handle = <&phy0>; phy-handle = <&phy0>;

2
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-clt-r30b1-base.dtsi
View File

@ -149,7 +149,7 @@
gmac1: mac@1 { gmac1: mac@1 {
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
label = "wan";
reg = <1>; reg = <1>;
phy-mode = "gmii"; phy-mode = "gmii";
phy-handle = <&phy0>; phy-handle = <&phy0>;

12
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-cmcc-a10.dts
View File

@ -120,18 +120,6 @@
}; };
}; };
gmac1: mac@1 {
compatible = "mediatek,eth-mac";
reg = <1>;
phy-mode = "2500base-x";
fixed-link {
speed = <2500>;
full-duplex;
pause;
};
};
mdio: mdio-bus { mdio: mdio-bus {
#address-cells = <1>; #address-cells = <1>;

2
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-cmcc-rax3000m.dtsi
View File

@ -76,7 +76,7 @@
gmac1: mac@1 { gmac1: mac@1 {
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
label = "wan";
reg = <1>; reg = <1>;
phy-mode = "gmii"; phy-mode = "gmii";
phy-handle = <&phy0>; phy-handle = <&phy0>;

2
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-h3c-nx30pro.dts
View File

@ -141,7 +141,7 @@
gmac1: mac@1 { gmac1: mac@1 {
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
label = "wan";
reg = <1>; reg = <1>;
phy-mode = "gmii"; phy-mode = "gmii";
phy-handle = <&phy0>; phy-handle = <&phy0>;

2
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-imou_lc-hx3001.dts
View File

@ -134,7 +134,7 @@
gmac1: mac@1 { gmac1: mac@1 {
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
label = "wan";
reg = <1>; reg = <1>;
phy-mode = "gmii"; phy-mode = "gmii";
phy-handle = <&phy0>; phy-handle = <&phy0>;

2
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-konka-komi-a31.dts
View File

@ -126,7 +126,7 @@
gmac1: mac@1 { gmac1: mac@1 {
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
label = "wan";
reg = <1>; reg = <1>;
phy-mode = "gmii"; phy-mode = "gmii";
phy-handle = <&phy0>; phy-handle = <&phy0>;

23
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-zr-3020.dts
View File

@ -163,23 +163,22 @@
}; };
}; };
gmac1: mac@1 {
compatible = "mediatek,eth-mac";
reg = <1>;
phy-mode = "2500base-x";
fixed-link {
speed = <2500>;
full-duplex;
pause;
};
};
mdio: mdio-bus { mdio: mdio-bus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #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 { switch@0 {
compatible = "mediatek,mt7531"; compatible = "mediatek,mt7531";
reg = <31>; reg = <31>;

2
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3mini-emmc.dts
View File

@ -202,7 +202,7 @@
}; };
gmac1: mac@1 { gmac1: mac@1 {
label = "wan";
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
reg = <1>; reg = <1>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";

2
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-glinet-gl-mt6000.dts
View File

@ -153,7 +153,7 @@
}; };
gmac1: mac@1 { gmac1: mac@1 {
label = "wan";
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
reg = <1>; reg = <1>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";

2
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-jdcloud-re-cp-03.dts
View File

@ -99,7 +99,7 @@
}; };
gmac1: mac@1 { gmac1: mac@1 {
label = "wan";
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
reg = <1>; reg = <1>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";

2
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-netcore-n60.dts
View File

@ -117,7 +117,7 @@
}; };
gmac1: mac@1 { gmac1: mac@1 {
label = "wan";
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
reg = <1>; reg = <1>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";

2
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-pro.dtsi
View File

@ -75,7 +75,7 @@
}; };
gmac1: mac@1 { gmac1: mac@1 {
label = "wan";
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
reg = <1>; reg = <1>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";

2
target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-tl-xdr-common.dtsi
View File

@ -90,7 +90,7 @@
}; };
gmac1: mac@1 { gmac1: mac@1 {
label = "wan";
compatible = "mediatek,eth-mac"; compatible = "mediatek,eth-mac";
reg = <1>; reg = <1>;
phy-mode = "2500base-x"; phy-mode = "2500base-x";

2
target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.c
View File

@ -710,7 +710,7 @@ static int hnat_probe(struct platform_device *pdev)
err = of_property_read_string(np, "mtketh-ppd", &name); err = of_property_read_string(np, "mtketh-ppd", &name);
if (err < 0) if (err < 0)
strncpy(hnat_priv->ppd, "eth1", IFNAMSIZ); strncpy(hnat_priv->ppd, "wan", IFNAMSIZ);
else else
strncpy(hnat_priv->ppd, (char *)name, IFNAMSIZ - 1); strncpy(hnat_priv->ppd, (char *)name, IFNAMSIZ - 1);
dev_info(&pdev->dev, "ppd = %s\n", hnat_priv->ppd); dev_info(&pdev->dev, "ppd = %s\n", hnat_priv->ppd);

14
target/linux/mediatek/mt7981/base-files/etc/board.d/02_network
View File

@ -20,11 +20,11 @@ mediatek_setup_interfaces()
"0:lan" "1:lan" "2:lan" "3:lan" "4:lan" "6u@eth0" "0:lan" "1:lan" "2:lan" "3:lan" "4:lan" "6u@eth0"
;; ;;
*2500wan-p5*) *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-ax3000t* |\
xiaomi,mi-router-wr30u*) 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*) *360,t7*)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan
@ -36,20 +36,20 @@ mediatek_setup_interfaces()
h3c,nx30pro |\ h3c,nx30pro |\
*imou,lc-hx3001* |\ *imou,lc-hx3001* |\
*konka,komi-a31*) *konka,komi-a31*)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1 ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan
;; ;;
*cmcc,a10*) *cmcc,a10*)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan
;; ;;
*jcg,q30*) *jcg,q30*)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan
;; ;;
abt,asr3000 |\ abt,asr3000 |\
*rax3000m*) *rax3000m*)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1 ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan
;; ;;
*nokia,ea0326gmp*) *nokia,ea0326gmp*)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1 ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan
;; ;;
*mt3000* |\ *mt3000* |\
glinet,x3000-emmc |\ glinet,x3000-emmc |\
@ -58,7 +58,7 @@ mediatek_setup_interfaces()
ucidef_set_interfaces_lan_wan "eth1" "eth0" ucidef_set_interfaces_lan_wan "eth1" "eth0"
;; ;;
*zr-3020*) *zr-3020*)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" wan ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan
;; ;;
nradio,wt9103) nradio,wt9103)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" eth1 ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" eth1

10
target/linux/mediatek/mt7986/base-files/etc/board.d/02_network
View File

@ -27,19 +27,19 @@ mediatek_setup_interfaces()
;; ;;
netcore,n60 |\ netcore,n60 |\
ruijie,rg-x60-pro*) 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) 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) 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) tplink,tl-xdr6086)
ucidef_set_interfaces_lan_wan "lan1 lan2" eth1 ucidef_set_interfaces_lan_wan "lan1 lan2" wan
;; ;;
tplink,tl-xdr6088) 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 ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3 lan4 lan5" eth1