dts: r4pro: update to 6.18 state with eth-mux

Author: frank-w

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

@@ -3,28 +3,30 @@
 / {
 	model = "Bananapi BPI-R4";
 	compatible = "bananapi,bpi-r4-pro-8x",
+		     "bananapi,bpi-r4-pro",
 		     "mediatek,mt7988a";
 };
-//not checked changes:
-// 2,3,
+
 &eth {
 	mux: mux-bus {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		mux1: ethernet-mux@1 {
 			compatible = "mediatek,eth-mux";
-			reg = <1>;
+			reg = <1>; //map to gmac1
 			chan-sel-gpios = <&pio 3 GPIO_ACTIVE_HIGH>;
 			mod-def0-gpios = <&pio 1 GPIO_ACTIVE_LOW>; //also moddef0 of sfp2
 			sfp-present-channel = <1>;
 			#address-cells = <1>;
 			#size-cells = <0>;
+
 			channel_10: channel@0 {
 				reg = <0>;
 				phy-mode = "10gbase-r";
 				phy-connection-type = "10gbase-r";
 				phy-handle = <&phy28>;
 			};
+
 			channel_11: channel@1 {
 				reg = <1>;
 				phy-mode = "10gbase-r";
@@ -33,46 +35,22 @@
 				sfp = <&sfp2>;
 			};
 		};
-		/*mux2: ethernet-mux@2 {
-			compatible = "mediatek,eth-mux";
-			reg = <2>;
-			chan-sel-gpios = <&pio 54 GPIO_ACTIVE_HIGH>;
-			mod-def0-gpios = <&pio 4 GPIO_ACTIVE_LOW>;
-			sfp-present-channel = <0>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			channel_20: channel@0 {
-				reg = <0>;
-				phy-mode = "10gbase-r";
-				phy-connection-type = "10gbase-r";
-				managed = "in-band-status";
-				sfp = <&sfp1>;
-			};
-			channel_21: channel@1 {
-				reg = <1>;
-				phy-mode = "usxgmii";
-				phy-connection-type = "usxgmii";
-				phy-handle = <&phy24>;
-			};
-		};*/
 	};
 };
 
 &gmac1 {
-	phy-mode = "10gbase-r";
-	phy-connection-type = "10gbase-r";
-	phy = <&phy28>;
+	phy-mode = "usxgmii";
+	phy-connection-type = "usxgmii";
+	phy-handle = <&phy28>;
 	status = "okay";
 };
 
 &mdio_bus {
-	clock-frequency = <12500000>; //for faster fw download to 10G phys
+	/* external Airoha AN8831X connected to MXL switch */
 
-	/* external Airoha AN8831X is connected to Mxl 2.5G switch */
 	phy24: ethernet-phy@24 {
 		reg = <24>;
 		compatible = "ethernet-phy-ieee802.3-c45";
-		//reset-gpios = <&pca9555 12 GPIO_ACTIVE_LOW>;
 		reset-gpios = <&pio 83 GPIO_ACTIVE_LOW>; //change 5
 		reset-assert-us = <200000>;
 		reset-deassert-us = <350000>;
@@ -82,14 +60,14 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			phy24_led0: an8831x_phy24_led0@0 {
+			phy24_led0: led@0 {
 				reg = <0>;
 				linux,default-trigger = "netdev";
 				active-high;
 				status = "okay";
 			};
 
-			phy24_led1: an8831x_phy24_led1@1 {
+			phy24_led1: led@1 {
 				reg = <1>;
 				linux,default-trigger = "netdev";
 				active-high;
@@ -102,8 +80,7 @@
 	phy28: ethernet-phy@28 {
 		reg = <28>;
 		compatible = "ethernet-phy-ieee802.3-c45";
-		//reset-gpios = <&pca9555 13 GPIO_ACTIVE_LOW>;
-		reset-gpios = <&pio 82 GPIO_ACTIVE_LOW>; //change 5
+		reset-gpios = <&pio 82 GPIO_ACTIVE_LOW>;
 		reset-assert-us = <200000>;
 		reset-deassert-us = <350000>;
 		firmware-name = "aeonsemi/as21x1x_fw.bin";
@@ -112,14 +89,14 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			phy28_led0: an8831x_phy28_led0@0 {
+			phy28_led0: led@0 {
 				reg = <0>;
 				linux,default-trigger = "netdev";
 				active-high;
 				status = "okay";
 			};
 
-			phy28_led1: an8831x_phy28_led1@1 {
+			phy28_led1: led@1 {
 				reg = <1>;
 				linux,default-trigger = "netdev";
 				active-high;
@@ -130,18 +107,23 @@
 };
 
 &switch16 {
-	/*ds_mux: ds-mux-bus {
+	ds_mux: ds-mux-bus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
 		ds_mux0: ds-mux@0 {
 			compatible = "mxl862xx,ds-mux";
 			reg = <12>;
 			chan-sel-gpios = <&pio 54 GPIO_ACTIVE_HIGH>;
 			mod-def0-gpios = <&pio 4 GPIO_ACTIVE_LOW>;
 			sfp-present-channel = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
 
 			ds_channel_0: channel@0 {
 				reg = <0>;
-				phy-mode = "10gbase-r";
-				phy-connection-type = "10gbase-r";
+				phy-mode = "usxgmii";
+				phy-connection-type = "usxgmii";
 				managed = "in-band-status";
 				sfp = <&sfp1>;
 			};
@@ -153,10 +135,9 @@
 				phy-handle = <&phy24>;
 			};
 		};
-	};*/
-
+	};
 	ports {
-		/*port6: port@6 {
+		port6: port@6 {
 			reg = <12>;
 			label = "mxl_lan5";
 			phy-mode = "usxgmii";
@@ -167,7 +148,7 @@
 				speed = <10000>;
 				full-duplex;
 			};
-		};*/
+		};
 
 	};
 };