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 <A.Bajkowski@stud.elka.pw.edu.pl>
[squash two separate patches, rephrase commit title/message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
index d6c521cfe7e0f9132fc24cd583f48344d71d4191..793818471973c307e29d7311440f66e73225f18c 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
+++ b/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>;
                };
        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
index 1553d2f7f44924c9f3c737dece3ad3673689b0c2..70dff97ec1b4d861c036b67004cc5868f7d57446 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
+++ b/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";

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
index 4631ad4ffe0ec3b94ba54ae813568c2d878ac0dc..7709a86e5540710ccd9bac3503f961f21226d99d 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
+++ b/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>;
                };
        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
index 4fbc1ac4962b4e9d668bd843edd36c8a31c8706b..f5ea12b7e25bf5d1de4d842aa08ad6ddf2f5fdfa 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
+++ b/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>;
                };
        };
 

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
index eabbc0257f92d8f37665cb7277295dff9a9fd98f..c4ccac8932c185562824d19a2b68576219af732a 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
+++ b/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 {

diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
index 77b4f0defbda952468b80de95bf5d2612c09ed4c..46b699a93e8407c62aadcc516a9535620d04f3ac 100644 (file)
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
+++ b/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 {