lantiq: set port numbers corresponding to reg value

Fix inconsistencies found in DTS files and sort ethernet ports based on
updated names.

Signed-off-by: Aleksander Jan Bajkowski <[email protected]>
[squash two separate patches, rephrase commit title/message]
Signed-off-by: Adrian Schmutzler <[email protected]>

target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts

@@ -110,29 +110,29 @@
 			phy-mode = "rgmii";
 			phy-handle = <&phy0>;
 		};
-		ethernet@1 {
-			compatible = "lantiq,xrx200-pdi-port";
-			reg = <4>;
-			phy-mode = "mii";
-			phy-handle = <&phy13>;
-		};
 		ethernet@2 {
 			compatible = "lantiq,xrx200-pdi-port";
-			reg = <5>;
+			reg = <2>;
 			phy-mode = "mii";
-			phy-handle = <&phy14>;
+			phy-handle = <&phy11>;
 		};
 		ethernet@3 {
 			compatible = "lantiq,xrx200-pdi-port";
-			reg = <2>;
+			reg = <3>;
 			phy-mode = "mii";
-			phy-handle = <&phy11>;
+			phy-handle = <&phy12>;
 		};
 		ethernet@4 {
 			compatible = "lantiq,xrx200-pdi-port";
-			reg = <3>;
+			reg = <4>;
 			phy-mode = "mii";
-			phy-handle = <&phy12>;
+			phy-handle = <&phy13>;
+		};
+		ethernet@5 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <5>;
+			phy-mode = "mii";
+			phy-handle = <&phy14>;
 		};
 	};
 

target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi

@@ -105,7 +105,7 @@
 			phy-handle = <&phy11>;
 		};
 
-		ethernet@3 {
+		ethernet@4 {
 			compatible = "lantiq,xrx200-pdi-port";
 			reg = <4>;
 			phy-mode = "gmii";

target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts

@@ -162,29 +162,29 @@
 		reg = <0>;
 		lantiq,switch;
 
-		ethernet@1 {
-			compatible = "lantiq,xrx200-pdi-port";
-			reg = <4>;
-			phy-mode = "mii";
-			phy-handle = <&phy13>;
-		};
 		ethernet@2 {
 			compatible = "lantiq,xrx200-pdi-port";
-			reg = <5>;
+			reg = <2>;
 			phy-mode = "mii";
-			phy-handle = <&phy14>;
+			phy-handle = <&phy11>;
 		};
 		ethernet@3 {
 			compatible = "lantiq,xrx200-pdi-port";
-			reg = <2>;
+			reg = <3>;
 			phy-mode = "mii";
-			phy-handle = <&phy11>;
+			phy-handle = <&phy12>;
 		};
 		ethernet@4 {
 			compatible = "lantiq,xrx200-pdi-port";
-			reg = <3>;
+			reg = <4>;
 			phy-mode = "mii";
-			phy-handle = <&phy12>;
+			phy-handle = <&phy13>;
+		};
+		ethernet@5 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <5>;
+			phy-mode = "mii";
+			phy-handle = <&phy14>;
 		};
 	};
 

target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi

@@ -103,17 +103,11 @@
 		reg = <0>;
 		lantiq,switch;
 
-		ethernet@4 {
-			compatible = "lantiq,xrx200-pdi-port";
-			reg = <4>;
-			phy-mode = "gmii";
-			phy-handle = <&phy13>;
-		};
-		ethernet@2 {
+		ethernet@0 {
 			compatible = "lantiq,xrx200-pdi-port";
-			reg = <2>;
-			phy-mode = "gmii";
-			phy-handle = <&phy11>;
+			reg = <0>;
+			phy-mode = "rgmii";
+			phy-handle = <&phy0>;
 		};
 		ethernet@1 {
 			compatible = "lantiq,xrx200-pdi-port";
@@ -121,11 +115,17 @@
 			phy-mode = "rgmii";
 			phy-handle = <&phy1>;
 		};
-		ethernet@0 {
+		ethernet@2 {
 			compatible = "lantiq,xrx200-pdi-port";
-			reg = <0>;
-			phy-mode = "rgmii";
-			phy-handle = <&phy0>;
+			reg = <2>;
+			phy-mode = "gmii";
+			phy-handle = <&phy11>;
+		};
+		ethernet@4 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <4>;
+			phy-mode = "gmii";
+			phy-handle = <&phy13>;
 		};
 	};
 

target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi

@@ -121,24 +121,24 @@
 			phy-handle = <&phy0>;
 			// gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
 		};
-		ethernet@5 {
-			compatible = "lantiq,xrx200-pdi-port";
-			reg = <5>;
-			phy-mode = "rgmii";
-			phy-handle = <&phy5>;
-		};
 		ethernet@2 {
 			compatible = "lantiq,xrx200-pdi-port";
 			reg = <2>;
 			phy-mode = "gmii";
 			phy-handle = <&phy11>;
 		};
-		ethernet@3 {
+		ethernet@4 {
 			compatible = "lantiq,xrx200-pdi-port";
 			reg = <4>;
 			phy-mode = "gmii";
 			phy-handle = <&phy13>;
 		};
+		ethernet@5 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <5>;
+			phy-mode = "rgmii";
+			phy-handle = <&phy5>;
+		};
 	};
 
 	mdio {

target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi

@@ -41,24 +41,24 @@
 			phy-handle = <&phy0>;
 			// gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
 		};
-		ethernet@5 {
-			compatible = "lantiq,xrx200-pdi-port";
-			reg = <5>;
-			phy-mode = "rgmii";
-			phy-handle = <&phy5>;
-		};
 		ethernet@2 {
 			compatible = "lantiq,xrx200-pdi-port";
 			reg = <2>;
 			phy-mode = "gmii";
 			phy-handle = <&phy11>;
 		};
-		ethernet@3 {
+		ethernet@4 {
 			compatible = "lantiq,xrx200-pdi-port";
 			reg = <4>;
 			phy-mode = "gmii";
 			phy-handle = <&phy13>;
 		};
+		ethernet@5 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <5>;
+			phy-mode = "rgmii";
+			phy-handle = <&phy5>;
+		};
 	};
 
 	mdio {