From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Wed, 8 Feb 2023 20:32:30 +0000 (+0200)
Subject: meow
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e077c8afdc404f37d625767eaf8b9324357da67b;p=openwrt%2Fstaging%2Fstintel.git

meow
---

diff --git a/target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m200.dts b/target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m200.dts
index 0b251f52bf..869550f00e 100644
--- a/target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m200.dts
+++ b/target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m200.dts
@@ -66,7 +66,7 @@
 &enet2 {
 	phy-mode = "sgmii";
 	phy-handle = <&phy0>;
-	fsl,fman-ports = <&fman0_rx_0x0a &fman0_tx_0x2a>;
+	//fsl,fman-ports = <&fman0_rx_0x0a &fman0_tx_0x2a>;
 };
 
 // ethernet @ e0000 = eth1 = phy@1
@@ -99,7 +99,6 @@
 	};
 };
 
-
 &mdio0 {
 	compatible = "fsl,fman-memac-mdio";
 
@@ -197,7 +196,7 @@
 
 				reg = "<5>";
 				label = "cpu";
-				ethernet = <&enet4>;
+				ethernet = <&enet3>;
 				phy-mode = "rgmii-id";
 
 				fixed-link {
@@ -210,8 +209,8 @@
 				//status = "disabled";
 				reg = <6>;
 				label = "cpu";
-				ethernet = <&enet3>;
-				phy-mode = "rgmii-txid";
+				ethernet = <&enet4>;
+				phy-mode = "rgmii";
 
 				fixed-link {
 					speed = <1000>;
diff --git a/target/linux/qoriq/patches-5.10/300-m200-interface-order.patch b/target/linux/qoriq/patches-5.10/300-m200-interface-order.patch
deleted file mode 100644
index e001799159..0000000000
--- a/target/linux/qoriq/patches-5.10/300-m200-interface-order.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi b/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi
-index 099a598c74c0..5263b00bbc35 100644
---- a/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi
-@@ -137,16 +137,6 @@ pca9546@77 {
- 		};
- 
- 		fman@400000 {
--			ethernet@e6000 {
--				phy-handle = <&phy_rgmii_0>;
--				phy-connection-type = "rgmii";
--			};
--
--			ethernet@e8000 {
--				phy-handle = <&phy_rgmii_1>;
--				phy-connection-type = "rgmii";
--			};
--
- 			mdio0: mdio@fc000 {
- 				phy_sgmii_2: ethernet-phy@3 {
- 					reg = <0x03>;