Revert "mtk eth soc:revert label setting"

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

View File

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

View File

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

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 {
#address-cells = <1>;

View File

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

View File

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

View File

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

View File

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

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 {
#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>;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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);

View File

@ -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

View File

@ -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