Revert "ramips: mt7621-dts: mux phy0/4 to gmac1"

This reverts commit a28334d8b8.
Closed: #10050, #10053
This commit is contained in:
AmadeusGhost 2022-09-04 23:15:19 +08:00
parent a3b880a4e8
commit 39c57aca18
79 changed files with 403 additions and 989 deletions

View File

@ -490,7 +490,13 @@
compatible = "mediatek,eth-mac";
reg = <1>;
status = "disabled";
phy-mode = "rgmii-rxid";
phy-mode = "rgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
mdio: mdio-bus {
@ -567,7 +573,7 @@
mtketh-wan = "wan";
mtketh-ppd = "lan";
mtketh-lan = "lan";
mtketh-max-gmac = <2>;
mtketh-max-gmac = <1>;
mtkdsa-wan-port = <4>;
};

View File

@ -104,19 +104,6 @@
mtd-mac-address = <&factory 0xe00c>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe00c>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -138,6 +125,13 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe00c>;
mtd-mac-address-increment = <1>;
};
};
};

View File

@ -109,19 +109,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe000>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -143,6 +130,13 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe000>;
mtd-mac-address-increment = <1>;
};
};
};

View File

@ -7,26 +7,18 @@
model = "AsiaRF AP7621-001";
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe000>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "lan";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe000>;
mtd-mac-address-increment = <1>;
};
};
};

View File

@ -7,23 +7,15 @@
model = "AsiaRF AP7621-NV1";
};
&gmac1 {
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0xe000>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@2 {
status = "okay";
label = "lan1";

View File

@ -133,21 +133,14 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@1 {
status = "okay";
label = "lan1";

View File

@ -134,22 +134,13 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0xe000>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
};
port@1 {
status = "okay";
label = "lan1";

View File

@ -10,7 +10,7 @@
model = "ASUS RT-N56U B1";
aliases {
label-mac-device = &gmac1;
label-mac-device = &wan;
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
@ -143,19 +143,6 @@
mtd-mac-address = <&factory 0x8004>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0x4>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -177,6 +164,12 @@
status = "okay";
label = "lan1";
};
wan: port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0x4>;
};
};
};

View File

@ -152,18 +152,6 @@
};
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -185,6 +173,11 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
};
};
};

View File

@ -168,23 +168,13 @@
mtd-mac-address-increment = <(-1)>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <(-1)>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
};
port@1 {
status = "okay";
label = "lan4";

View File

@ -176,19 +176,6 @@
mtd-mac-address = <&factory 0x4>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0x4>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -210,6 +197,11 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
};
};
};

View File

@ -156,21 +156,6 @@
mtd-mac-address = <&bdinfo 0xde00>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&bdinfo 0xde00>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -192,6 +177,13 @@
status = "okay";
label = "lan1";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&bdinfo 0xde00>;
mtd-mac-address-increment = <1>;
};
};
};

View File

@ -81,21 +81,6 @@
mtd-mac-address = <&bdinfo 0xde00>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&bdinfo 0xde00>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&pcie {
status = "okay";
};
@ -204,5 +189,13 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&bdinfo 0xde00>;
mtd-mac-address-increment = <1>;
};
};
};

View File

@ -166,19 +166,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -200,6 +187,12 @@
status = "okay";
label = "lan1";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -12,7 +12,7 @@
model = "D-Link DIR-853 R1";
aliases {
label-mac-device = &gmac1;
label-mac-device = &wan;
led-boot = &led_power_orange;
led-failsafe = &led_power_blue;
led-running = &led_power_blue;
@ -105,21 +105,6 @@
mtd-mac-address-increment = <(-1)>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <(-2)>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -141,6 +126,13 @@
status = "okay";
label = "lan1";
};
wan: port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <(-2)>;
};
};
};

View File

@ -112,21 +112,13 @@
mtd-mac-address = <&radio 0x4>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&radio 0x4>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
};
port@1 {
status = "okay";
label = "lan4";

View File

@ -95,19 +95,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -129,6 +116,12 @@
status = "okay";
label = "lan1";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -155,19 +155,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -189,6 +176,12 @@
status = "okay";
label = "lan1";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -121,21 +121,13 @@
mtd-mac-address = <&factory 0x4>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0x4>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
};
port@1 {
status = "okay";
label = "lan4";

View File

@ -70,21 +70,14 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@1 {
status = "okay";
label = "lan4";

View File

@ -11,7 +11,7 @@
mtd-mac-address = <&factory 0xfff4>;
};
&gmac1 {
&wan {
mtd-mac-address = <&factory 0xfffa>;
};

View File

@ -11,7 +11,7 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
&wan {
mtd-mac-address = <&factory 0xe006>;
};

View File

@ -136,20 +136,13 @@
};
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
};
port@1 {
status = "okay";
label = "lan4";

View File

@ -6,7 +6,7 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
&wan {
mtd-mac-address = <&factory 0xe006>;
};

View File

@ -11,7 +11,7 @@
led-failsafe = &led_power_green;
led-running = &led_power_green;
led-upgrade = &led_power_green;
label-mac-device = &gmac1;
label-mac-device = &wan;
};
leds: leds {
@ -83,20 +83,13 @@
};
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
wan: port@0 {
status = "okay";
label = "wan";
};
port@1 {
status = "okay";
label = "lan4";

View File

@ -113,14 +113,7 @@
&gmac1 {
mtd-mac-address = <&factory 0xe000>;
mtd-mac-address-increment = <1>;
phy-mode = "rgmii";
status = "okay";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
&gsw {

View File

@ -14,7 +14,7 @@
led-failsafe = &led_run;
led-running = &led_run;
led-upgrade = &led_run;
label-mac-device = &gmac1;
label-mac-device = &wan;
};
chosen {
@ -119,19 +119,6 @@
mtd-mac-address-increment = <1>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0x4000>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@2 {
@ -143,6 +130,12 @@
status = "okay";
label = "lan2";
};
wan: port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0x4000>;
};
};
};

View File

@ -104,24 +104,16 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "ethblue";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe000>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "ethblack";
label = "lan1";
};
port@4 {
status = "okay";
label = "lan2";
};
};
};

View File

@ -104,30 +104,16 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "ethyellow";
phy-handle = <&ethphy5>;
mtd-mac-address = <&factory 0xe000>;
};
&mdio {
ethphy5: ethernet-phy@5 {
reg = <5>;
phy-mode = "rgmii-rxid";
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "ethblack";
label = "lan1";
};
port@4 {
status = "okay";
label = "ethblue";
label = "lan2";
};
};
};

View File

@ -73,6 +73,11 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
};
};
};
@ -80,18 +85,6 @@
mtd-mac-address = <&factory 0x8004>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&state_default {
gpio {
groups = "rgmii2", "jtag";

View File

@ -129,18 +129,6 @@
};
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@1 {
@ -157,6 +145,11 @@
status = "okay";
label = "lan3";
};
port@4 {
status = "okay";
label = "wan";
};
};
};

View File

@ -131,23 +131,15 @@
mtd-mac-address = <&iNIC_rf 0x4>;
};
&gmac1 {
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@1 {
status = "okay";
label = "lan4";

View File

@ -14,7 +14,7 @@
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
label-mac-device = &gmac1;
label-mac-device = &wan;
};
leds {
@ -130,21 +130,14 @@
mtd-mac-address = <&factory 0x1e000>;
};
&gmac1 {
&switch0 {
ports {
wan: port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0x1e006>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@1 {
status = "okay";
label = "lan4";

View File

@ -131,23 +131,15 @@
mtd-mac-address = <&factory 0x4>;
};
&gmac1 {
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@1 {
status = "okay";
label = "lan4";

View File

@ -11,7 +11,7 @@
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
label-mac-device = &gmac1;
label-mac-device = &wan;
};
leds {
@ -121,22 +121,14 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
&switch0 {
ports {
wan: port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@1 {
status = "okay";
label = "lan4";

View File

@ -123,22 +123,13 @@
mtd-mac-address = <&factory 0x4>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0x4>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
};
port@1 {
status = "okay";
label = "lan4";

View File

@ -114,22 +114,14 @@
mtd-mac-address = <&uboot 0x1fc20>;
};
&gmac1 {
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&uboot 0x1fc40>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@1 {
status = "okay";
label = "lan1";

View File

@ -98,22 +98,14 @@
mtd-mac-address = <&uboot 0x1fc20>;
};
&gmac1 {
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&uboot 0x1fc40>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@1 {
status = "okay";
label = "lan4";

View File

@ -14,7 +14,7 @@
led-failsafe = &led_wps;
led-running = &led_wps;
led-upgrade = &led_wps;
label-mac-device = &gmac1;
label-mac-device = &wan;
};
leds {
@ -132,19 +132,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0x4>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -169,6 +156,7 @@
wan: port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0x4>;
};
};
};

View File

@ -93,19 +93,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -127,6 +114,12 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -147,25 +147,14 @@
mtd-mac-address = <&factory 0x3fff4>;
};
&gmac1 {
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0x3fffa>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&hnat {
mtkdsa-wan-port = <0>;
};
&switch0 {
ports {
port@1 {
status = "okay";
label = "lan1";

View File

@ -94,14 +94,7 @@
&gmac1 {
mtd-mac-address = <&factory 0xe006>;
phy-mode = "rgmii";
status = "okay";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
&gsw {

View File

@ -135,19 +135,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@1 {
@ -159,6 +146,12 @@
status = "okay";
label = "lan1";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -148,18 +148,6 @@
};
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -181,6 +169,11 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
};
};
};

View File

@ -173,20 +173,13 @@
};
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
};
port@1 {
status = "okay";
label = "lan1";

View File

@ -116,22 +116,13 @@
mtd-mac-address = <&factory 0x2e>;
};
&gmac1 {
status = "okay";
label = "lan1";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0x2e>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "lan1";
};
port@1 {
status = "okay";
label = "lan2";

View File

@ -116,21 +116,6 @@
mtd-mac-address = <&factory 0x5>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0x5>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -152,6 +137,13 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0x5>;
mtd-mac-address-increment = <1>;
};
};
};

View File

@ -39,18 +39,6 @@
status = "okay";
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -72,6 +60,11 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
};
};
};

View File

@ -35,23 +35,3 @@
function = "gpio";
};
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@0 {
status = "disabled";
};
};
};

View File

@ -90,20 +90,13 @@
};
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
};
port@1 {
status = "okay";
label = "lan1";

View File

@ -97,21 +97,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe000>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -133,6 +118,13 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe000>;
mtd-mac-address-increment = <1>;
};
};
};

View File

@ -110,21 +110,6 @@
mtd-mac-address = <&factory 0x4>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -146,6 +131,13 @@
status = "okay";
label = "lan1";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <1>;
};
};
};

View File

@ -165,21 +165,6 @@
mtd-mac-address = <&factory 0x4>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <2>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -201,6 +186,13 @@
status = "okay";
label = "lan1";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <2>;
};
};
};

View File

@ -99,21 +99,6 @@
mtd-mac-address = <&factory 0x4>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <2>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -135,6 +120,13 @@
status = "okay";
label = "lan1";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <2>;
};
};
};

View File

@ -125,19 +125,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -159,6 +146,12 @@
status = "okay";
label = "lan1";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -128,22 +128,6 @@
nvmem-cell-names = "mac-address";
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
nvmem-cells = <&macaddr_bdinfo_9>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@2 {
@ -155,6 +139,14 @@
status = "okay";
label = "lan1";
};
port@4 {
status = "okay";
label = "wan";
nvmem-cells = <&macaddr_bdinfo_9>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
};
};

View File

@ -107,14 +107,7 @@
&gmac1 {
mtd-mac-address = <&factory 0xe006>;
phy-mode = "rgmii";
status = "okay";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
&gsw {

View File

@ -78,19 +78,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -112,6 +99,12 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -115,14 +115,7 @@
};
&gmac1 {
phy-mode = "rgmii";
status = "okay";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
&gsw {

View File

@ -109,19 +109,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -143,6 +130,12 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -105,21 +105,6 @@
mtd-mac-address = <&factory 0xe006>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -141,6 +126,13 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
mtd-mac-address-increment = <1>;
};
};
};

View File

@ -14,7 +14,7 @@
led-failsafe = &led_red;
led-running = &led_blue;
led-upgrade = &led_red;
label-mac-device = &gmac1;
label-mac-device = &wan_port;
};
chosen {
@ -112,21 +112,14 @@
mtd-mac-address = <&factory 0x4>;
};
&gmac1 {
&switch0 {
ports {
wan_port: port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0x28>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@1 {
status = "okay";
label = "lan1";

View File

@ -103,21 +103,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe000>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -139,6 +124,13 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe000>;
mtd-mac-address-increment = <1>;
};
};
};

View File

@ -100,19 +100,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -134,6 +121,12 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -165,23 +165,15 @@
mtd-mac-address = <&config 0x8>;
};
&gmac1 {
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&config 0x8>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@1 {
status = "okay";
label = "lan1";

View File

@ -4,25 +4,3 @@
model = "Ubiquiti EdgeRouter X";
compatible = "ubnt,edgerouter-x", "mediatek,mt7621-soc";
};
&gmac1 {
status = "okay";
label = "eth0";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0x22>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@0 {
status = "disabled";
};
};
};

View File

@ -77,21 +77,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe000>;
mtd-mac-address-increment = <1>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -113,6 +98,13 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe000>;
mtd-mac-address-increment = <1>;
};
};
};

View File

@ -179,19 +179,6 @@
mtd-mac-address = <&factory 0xe006>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe000>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@1 {
@ -208,6 +195,12 @@
status = "okay";
label = "lan1";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe000>;
};
};
};

View File

@ -68,19 +68,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@1 {
@ -92,6 +79,12 @@
status = "okay";
label = "lan1";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -11,7 +11,7 @@
led-failsafe = &led_status_yellow;
led-running = &led_status_blue;
led-upgrade = &led_status_yellow;
label-mac-device = &gmac1;
label-mac-device = &wan;
};
chosen {
@ -135,21 +135,6 @@
nvmem-cell-names = "mac-address";
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
nvmem-cells = <&macaddr_factory_e006>;
nvmem-cell-names = "mac-address";
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@2 {
@ -161,6 +146,13 @@
status = "okay";
label = "lan1";
};
wan: port@4 {
status = "okay";
label = "wan";
nvmem-cells = <&macaddr_factory_e006>;
nvmem-cell-names = "mac-address";
};
};
};

View File

@ -135,14 +135,7 @@
&gmac1 {
mtd-mac-address = <&factory 0x3fffa>;
phy-mode = "rgmii";
status = "okay";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
&gsw {

View File

@ -30,14 +30,7 @@
&gmac1 {
mtd-mac-address = <&factory 0xe006>;
phy-mode = "rgmii";
status = "okay";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
&gsw {

View File

@ -91,14 +91,7 @@
&gmac1 {
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <1>;
phy-mode = "rgmii";
status = "okay";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
&gsw {

View File

@ -128,21 +128,14 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
&switch0 {
ports {
port@0 {
status = "okay";
label = "wan";
phy-handle = <&ethphy0>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
&switch0 {
ports {
port@1 {
status = "okay";
label = "lan1";

View File

@ -136,19 +136,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -170,6 +157,12 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -77,19 +77,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -111,6 +98,12 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -99,19 +99,6 @@
mtd-mac-address = <&factory 0xe000>;
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
mtd-mac-address = <&factory 0xe006>;
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&switch0 {
ports {
port@0 {
@ -133,6 +120,12 @@
status = "okay";
label = "lan4";
};
port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0xe006>;
};
};
};

View File

@ -3400,7 +3400,6 @@ static const struct net_device_ops mtk_netdev_ops = {
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
{
const char *name = of_get_property(np, "label", NULL);
const __be32 *_id = of_get_property(np, "reg", NULL);
struct phylink *phylink;
int phy_mode, id, err;
@ -3491,9 +3490,6 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
eth->netdev[id]->irq = eth->irq[0];
eth->netdev[id]->dev.of_node = np;
if (name)
strlcpy(eth->netdev[id]->name, name, IFNAMSIZ);
return 0;
free_netdev:

View File

@ -57,11 +57,9 @@ ramips_setup_interfaces()
ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "4:wan" "6u@eth0" "5u@eth1"
;;
gnubee,gb-pc1)
ucidef_set_interface_lan "ethblack ethblue"
;;
gnubee,gb-pc1|\
gnubee,gb-pc2)
ucidef_set_interface_lan "ethblack ethblue ethyellow"
ucidef_set_interface_lan "lan1 lan2"
;;
hatlab,gateboard-one)
ucidef_set_interfaces_lan_wan "eth0 eth1 eth2 eth3 eth4" "eth5"