Skip to contentSkip to conversation

arm64: dts: marvell: espressobin: Simplify v7 ethernet port labeling

PATCH In review Andre Heider 4 participants 4 messages Sep 8, 2020 – Sep 23, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: marvell: espressobin: Simplify v7 ethernet port labeling

Now that the switch ports have a label in the .dtsi, simplify the whole "switch0" block for the v7 dts files.

---

This goes on top of Pali's patch:
"arm64: dts: marvell: espressobin: Add ethernet switch aliases"

The resulting .dtb files are the same.

 .../armada-3720-espressobin-v7-emmc.dts        | 18 +++++-------------
 .../dts/marvell/armada-3720-espressobin-v7.dts | 18 +++++-------------
 2 files changed, 10 insertions(+), 26 deletions(-)
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +5 -13
index 215d2f702623..61d49d6a2a2a 100644
@@ -28,20 +28,12 @@ aliases {
 	};
 };
 
-&switch0 {
-	ports {
-		switch0port1: port@1 {
-			reg = <1>;
-			label = "lan1";
-			phy-handle = <&switch0phy0>;
-		};
+&switch0port1 {
+	label = "lan1";
+};
 
-		switch0port3: port@3 {
-			reg = <3>;
-			label = "wan";
-			phy-handle = <&switch0phy2>;
-		};
-	};
+&switch0port3 {
+	label = "wan";
 };
 
 /* U11 */
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +5 -13
index b6f4af8ebafb..44dbe9a21cc7 100644
@@ -27,18 +27,10 @@ aliases {
 	};
 };
 
-&switch0 {
-	ports {
-		switch0port1: port@1 {
-			reg = <1>;
-			label = "lan1";
-			phy-handle = <&switch0phy0>;
-		};
+&switch0port1 {
+	label = "lan1";
+};
 
-		switch0port3: port@3 {
-			reg = <3>;
-			label = "wan";
-			phy-handle = <&switch0phy2>;
-		};
-	};
+&switch0port3 {
+	label = "wan";
 };
Signature · 1 line
2.28.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · On Tuesday 08 September 2020 09:30:50 Andre Heider wrote:

Now that the switch ports have a label in the .dtsi, simplify the whole "switch0" block for the v7 dts files.

Thank you, looks good!

Quoted 72 lines

---

This goes on top of Pali's patch:
"arm64: dts: marvell: espressobin: Add ethernet switch aliases"

The resulting .dtb files are the same.

 .../armada-3720-espressobin-v7-emmc.dts        | 18 +++++-------------
 .../dts/marvell/armada-3720-espressobin-v7.dts | 18 +++++-------------
 2 files changed, 10 insertions(+), 26 deletions(-)
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +5 -13
index 215d2f702623..61d49d6a2a2a 100644
@@ -28,20 +28,12 @@ aliases {
 	};
 };
 
-&switch0 {
-	ports {
-		switch0port1: port@1 {
-			reg = <1>;
-			label = "lan1";
-			phy-handle = <&switch0phy0>;
-		};
+&switch0port1 {
+	label = "lan1";
+};
 
-		switch0port3: port@3 {
-			reg = <3>;
-			label = "wan";
-			phy-handle = <&switch0phy2>;
-		};
-	};
+&switch0port3 {
+	label = "wan";
 };
 
 /* U11 */
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +5 -13
index b6f4af8ebafb..44dbe9a21cc7 100644
@@ -27,18 +27,10 @@ aliases {
 	};
 };
 
-&switch0 {
-	ports {
-		switch0port1: port@1 {
-			reg = <1>;
-			label = "lan1";
-			phy-handle = <&switch0phy0>;
-		};
+&switch0port1 {
+	label = "lan1";
+};
 
-		switch0port3: port@3 {
-			reg = <3>;
-			label = "wan";
-			phy-handle = <&switch0phy2>;
-		};
-	};
+&switch0port3 {
+	label = "wan";
 };
Signature · 1 line
2.28.0
maintainer
#3 lore raw
In reply to Andre Heider

Hi Andre,

Quoted 4 lines

Now that the switch ports have a label in the .dtsi, simplify the whole "switch0" block for the v7 dts files.

Applied on mvebu/dt64

Thanks,

Gregory

Quoted 72 lines

---

This goes on top of Pali's patch:
"arm64: dts: marvell: espressobin: Add ethernet switch aliases"

The resulting .dtb files are the same.

 .../armada-3720-espressobin-v7-emmc.dts        | 18 +++++-------------
 .../dts/marvell/armada-3720-espressobin-v7.dts | 18 +++++-------------
 2 files changed, 10 insertions(+), 26 deletions(-)
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +5 -13
index 215d2f702623..61d49d6a2a2a 100644
@@ -28,20 +28,12 @@ aliases {
 	};
 };
 
-&switch0 {
-	ports {
-		switch0port1: port@1 {
-			reg = <1>;
-			label = "lan1";
-			phy-handle = <&switch0phy0>;
-		};
+&switch0port1 {
+	label = "lan1";
+};
 
-		switch0port3: port@3 {
-			reg = <3>;
-			label = "wan";
-			phy-handle = <&switch0phy2>;
-		};
-	};
+&switch0port3 {
+	label = "wan";
 };
 
 /* U11 */
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +5 -13
index b6f4af8ebafb..44dbe9a21cc7 100644
@@ -27,18 +27,10 @@ aliases {
 	};
 };
 
-&switch0 {
-	ports {
-		switch0port1: port@1 {
-			reg = <1>;
-			label = "lan1";
-			phy-handle = <&switch0phy0>;
-		};
+&switch0port1 {
+	label = "lan1";
+};
 
-		switch0port3: port@3 {
-			reg = <3>;
-			label = "wan";
-			phy-handle = <&switch0phy2>;
-		};
-	};
+&switch0port3 {
+	label = "wan";
 };
Signature · 1 line
2.28.0
Signature · 3 lines
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com