ramips: restore full switch performance for USW-Flex

Since commit f1c9afd80138 ("ramips: mt7621-dts: mux phy0/4 to gmac1") the
USW-Flex lan1 port has been attached directly to the CPU. This improves
routing performance but hinders switching.

This is a generally accepted trade-off in that commit but for USW-Flex it
is a questionable choice. This switch is designed to deliver PoE to remote
places and using it as a router is unlikely. Meanwhile, the lan1 port is
also PoE-in and will often be the uplink, carrying most of the traffic.

Reverting f1c9afd80138 for USW-Flex restores full 1 Gbps switching
performance on all ports.

Signed-off-by: Anders Melchiorsen <amelchio@nogoto.net>
Link: https://github.com/openwrt/openwrt/pull/17703
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts b/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
index f2fb48cac2b2cb2ed47ff048b32f2edf3728a7c8..f548f1f9b786eaa352735a2c3b05d8906b7bf652 100644 (file)
--- a/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
+++ b/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
@@ -64,19 +64,6 @@
        label = "dsa";
 };
 
-&gmac1 {
-       status = "okay";
-       label = "lan1";
-       phy-handle = <&ethphy4>;
-
-       nvmem-cells = <&macaddr_eeprom>;
-       nvmem-cell-names = "mac-address";
-};
-
-&ethphy4 {
-       /delete-property/ interrupts;
-};
-
 &switch0 {
        ports {
                port@0 {
@@ -98,6 +85,11 @@
                        status = "okay";
                        label = "lan2";
                };
+
+                port@4 {
+                        status = "okay";
+                        label = "lan1";
+                };
        };
 };