[openwrt/openwrt] lantiq: set port numbers corresponding to reg value
LEDE Commits
lede-commits at lists.infradead.org
Mon Jul 6 19:06:02 EDT 2020
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/f496939f15b07c3386769491f7e4beb16b072240
commit f496939f15b07c3386769491f7e4beb16b072240
Author: Aleksander Jan Bajkowski <A.Bajkowski at stud.elka.pw.edu.pl>
AuthorDate: Sun May 17 12:33:56 2020 +0200
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 at stud.elka.pw.edu.pl>
[squash two separate patches, rephrase commit title/message]
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
.../boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts | 24 +++++++++----------
.../mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi | 2 +-
.../boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts | 24 +++++++++----------
.../mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi | 28 +++++++++++-----------
.../mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi | 14 +++++------
.../mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi | 14 +++++------
6 files changed, 53 insertions(+), 53 deletions(-)
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 d6c521cfe7..7938184719 100644
--- 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 at 1 {
- compatible = "lantiq,xrx200-pdi-port";
- reg = <4>;
- phy-mode = "mii";
- phy-handle = <&phy13>;
- };
ethernet at 2 {
compatible = "lantiq,xrx200-pdi-port";
- reg = <5>;
+ reg = <2>;
phy-mode = "mii";
- phy-handle = <&phy14>;
+ phy-handle = <&phy11>;
};
ethernet at 3 {
compatible = "lantiq,xrx200-pdi-port";
- reg = <2>;
+ reg = <3>;
phy-mode = "mii";
- phy-handle = <&phy11>;
+ phy-handle = <&phy12>;
};
ethernet at 4 {
compatible = "lantiq,xrx200-pdi-port";
- reg = <3>;
+ reg = <4>;
phy-mode = "mii";
- phy-handle = <&phy12>;
+ phy-handle = <&phy13>;
+ };
+ ethernet at 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 1553d2f7f4..70dff97ec1 100644
--- 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 at 3 {
+ ethernet at 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 4631ad4ffe..7709a86e55 100644
--- 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 at 1 {
- compatible = "lantiq,xrx200-pdi-port";
- reg = <4>;
- phy-mode = "mii";
- phy-handle = <&phy13>;
- };
ethernet at 2 {
compatible = "lantiq,xrx200-pdi-port";
- reg = <5>;
+ reg = <2>;
phy-mode = "mii";
- phy-handle = <&phy14>;
+ phy-handle = <&phy11>;
};
ethernet at 3 {
compatible = "lantiq,xrx200-pdi-port";
- reg = <2>;
+ reg = <3>;
phy-mode = "mii";
- phy-handle = <&phy11>;
+ phy-handle = <&phy12>;
};
ethernet at 4 {
compatible = "lantiq,xrx200-pdi-port";
- reg = <3>;
+ reg = <4>;
phy-mode = "mii";
- phy-handle = <&phy12>;
+ phy-handle = <&phy13>;
+ };
+ ethernet at 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 4fbc1ac496..f5ea12b7e2 100644
--- 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 at 4 {
- compatible = "lantiq,xrx200-pdi-port";
- reg = <4>;
- phy-mode = "gmii";
- phy-handle = <&phy13>;
- };
- ethernet at 2 {
+ ethernet at 0 {
compatible = "lantiq,xrx200-pdi-port";
- reg = <2>;
- phy-mode = "gmii";
- phy-handle = <&phy11>;
+ reg = <0>;
+ phy-mode = "rgmii";
+ phy-handle = <&phy0>;
};
ethernet at 1 {
compatible = "lantiq,xrx200-pdi-port";
@@ -121,11 +115,17 @@
phy-mode = "rgmii";
phy-handle = <&phy1>;
};
- ethernet at 0 {
+ ethernet at 2 {
compatible = "lantiq,xrx200-pdi-port";
- reg = <0>;
- phy-mode = "rgmii";
- phy-handle = <&phy0>;
+ reg = <2>;
+ phy-mode = "gmii";
+ phy-handle = <&phy11>;
+ };
+ ethernet at 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 eabbc0257f..c4ccac8932 100644
--- 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 at 5 {
- compatible = "lantiq,xrx200-pdi-port";
- reg = <5>;
- phy-mode = "rgmii";
- phy-handle = <&phy5>;
- };
ethernet at 2 {
compatible = "lantiq,xrx200-pdi-port";
reg = <2>;
phy-mode = "gmii";
phy-handle = <&phy11>;
};
- ethernet at 3 {
+ ethernet at 4 {
compatible = "lantiq,xrx200-pdi-port";
reg = <4>;
phy-mode = "gmii";
phy-handle = <&phy13>;
};
+ ethernet at 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 77b4f0defb..46b699a93e 100644
--- 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 at 5 {
- compatible = "lantiq,xrx200-pdi-port";
- reg = <5>;
- phy-mode = "rgmii";
- phy-handle = <&phy5>;
- };
ethernet at 2 {
compatible = "lantiq,xrx200-pdi-port";
reg = <2>;
phy-mode = "gmii";
phy-handle = <&phy11>;
};
- ethernet at 3 {
+ ethernet at 4 {
compatible = "lantiq,xrx200-pdi-port";
reg = <4>;
phy-mode = "gmii";
phy-handle = <&phy13>;
};
+ ethernet at 5 {
+ compatible = "lantiq,xrx200-pdi-port";
+ reg = <5>;
+ phy-mode = "rgmii";
+ phy-handle = <&phy5>;
+ };
};
mdio {
More information about the lede-commits
mailing list