arm64: dts: mediatek: mt7988: move sfp-wan back to dtsi

Author: frank-w

arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts

@@ -5,18 +5,6 @@
 #include "mt7988a-bananapi-bpi-r4.dtsi"
 
 / {
-	/* SFP1 cage (WAN) */
-	sfp1: sfp1 {
-		compatible = "sff,sfp";
-		i2c-bus = <&i2c_sfp1>;
-		los-gpios = <&pio 54 GPIO_ACTIVE_HIGH>;
-		mod-def0-gpios = <&pio 82 GPIO_ACTIVE_LOW>;
-		tx-disable-gpios = <&pio 70 GPIO_ACTIVE_HIGH>;
-		tx-fault-gpios = <&pio 69 GPIO_ACTIVE_HIGH>;
-		rate-select0-gpios = <&pio 21 GPIO_ACTIVE_LOW>;
-		maximum-power-milliwatt = <3000>;
-	};
-
 	/* SFP2 cage (LAN) */
 	sfp2: sfp2 {
 		compatible = "sff,sfp";
@@ -37,13 +25,6 @@
 	status = "okay";
 };
 
-&gmac2 {
-	sfp = <&sfp1>;
-	managed = "in-band-status";
-	phy-mode = "usxgmii";
-	status = "okay";
-};
-
 &pca9545 {
 	i2c_sfp2: i2c@2 {
 		#address-cells = <1>;

arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi

@@ -52,6 +52,18 @@
 		regulator-always-on;
 	};
 
+	/* SFP1 cage (WAN) */
+	sfp1: sfp1 {
+		compatible = "sff,sfp";
+		i2c-bus = <&i2c_sfp1>;
+		los-gpios = <&pio 54 GPIO_ACTIVE_HIGH>;
+		mod-def0-gpios = <&pio 82 GPIO_ACTIVE_LOW>;
+		tx-disable-gpios = <&pio 70 GPIO_ACTIVE_HIGH>;
+		tx-fault-gpios = <&pio 69 GPIO_ACTIVE_HIGH>;
+		rate-select0-gpios = <&pio 21 GPIO_ACTIVE_LOW>;
+		maximum-power-milliwatt = <3000>;
+	};
+
 	gpio-keys {
 		compatible = "gpio-keys";
 
@@ -137,6 +149,13 @@
 	status = "okay";
 };
 
+&gmac2 {
+	sfp = <&sfp1>;
+	managed = "in-band-status";
+	phy-mode = "usxgmii";
+	status = "okay";
+};
+
 &switch {
 	status = "okay";
 };