Skip to contentSkip to conversation

powerpc: dts: t1040rdb: fix ports names for Seville Ethernet switch

PATCH Superseded Maxim Kiselev 4 participants 12 messages Dec 30, 2021 – Feb 15, 2022 1 message not in the archive

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

PATCH 1/1 powerpc: dts: t1040rdb: fix ports names for Seville Ethernet switch

Fix network interface names for the switch ports according to labels that are written on the front panel of the board. They start from ETH3 and end at ETH10.

Fixes e69eb0824d8c ("powerpc: dts: t1040rdb: add ports for Seville

Ethernet switch")

---
 arch/powerpc/boot/dts/fsl/t1040rdb.dts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/boot/dts/fsl/t1040rdb.dts +4 -4
index af0c8a6f56138..b6733e7e65805 100644
@@ -119,7 +119,7 @@ &seville_port0 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_0>;
 	phy-mode = "qsgmii";
-	label = "ETH5";
+	label = "ETH3";
 	status = "okay";
 };
 
@@ -135,7 +135,7 @@ &seville_port2 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_2>;
 	phy-mode = "qsgmii";
-	label = "ETH7";
+	label = "ETH5";
 	status = "okay";
 };
 
@@ -151,7 +151,7 @@ &seville_port4 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_4>;
 	phy-mode = "qsgmii";
-	label = "ETH9";
+	label = "ETH7";
 	status = "okay";
 };
 
@@ -167,7 +167,7 @@ &seville_port6 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_6>;
 	phy-mode = "qsgmii";
-	label = "ETH11";
+	label = "ETH9";
 	status = "okay";
 };
 
Signature · 1 line
2.32.0
#1 lore raw
Quoted 6 lines · Maxim Kiselev

Fix network interface names for the switch ports according to labels that are written on the front panel of the board. They start from ETH3 and end at ETH10.

Fixes e69eb0824d8c ("powerpc: dts: t1040rdb: add ports for Seville

Ethernet switch")

A Fixes: tag should not wrap on multiple lines.

Quoted 3 lines

---

Sadly I'm not able to confirm or disprove this change right now, because my T1040RDB has a bad DDR memory stick, it seems, so it just randomly hangs. But I'm pretty sure the Ethernet ports were properly mapped out when I tested them.

Do you have the T1040RDB or the T1040D4RDB? Because the front panel of my T1040RDB looks like this:

 +---------------------------------------------------------------------+
 |                                                                     |
 |  +-------+-------+               +-------+-------+-------+-------+  |
 |  | UART0 |  ETH1 |               |  ETH4 |  ETH6 |  ETH8 | ETH10 |  |
 |  +-------+-------+-------+-------+-------+-------+-------+-------+  |
 |  | UART1 |  ETH0 |  ETH2 |  ETH3 |  ETH5 |  ETH7 |  ETH9 | ETH11 |  |
 +--+-------+-------+-------+-------+-------+-------+-------+-------+--+
Quoted 46 lines
 arch/powerpc/boot/dts/fsl/t1040rdb.dts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/boot/dts/fsl/t1040rdb.dts +4 -4
index af0c8a6f56138..b6733e7e65805 100644
@@ -119,7 +119,7 @@ &seville_port0 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_0>;
 	phy-mode = "qsgmii";
-	label = "ETH5";
+	label = "ETH3";
 	status = "okay";
 };
 
@@ -135,7 +135,7 @@ &seville_port2 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_2>;
 	phy-mode = "qsgmii";
-	label = "ETH7";
+	label = "ETH5";
 	status = "okay";
 };
 
@@ -151,7 +151,7 @@ &seville_port4 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_4>;
 	phy-mode = "qsgmii";
-	label = "ETH9";
+	label = "ETH7";
 	status = "okay";
 };
 
@@ -167,7 +167,7 @@ &seville_port6 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_6>;
 	phy-mode = "qsgmii";
-	label = "ETH11";
+	label = "ETH9";
 	status = "okay";
 };
 
Signature · 1 line
2.32.0
#2 lore raw

Yes, I have T1040RDB ver.b (without SFP) and my front panel looks like this.

 +---------------------------------------------------------------------+
 |                    NO SFP                                           |
 |  +-------+-------+   |           +-------+-------+-------+-------+  |
 |  | UART0 |  ETH1 |   |           |  ETH4 |  ETH6 |  ETH8 | ETH10 |  |
 |  +-------+-------+  \|/  +-------+-------+-------+-------+-------+  |
 |  | UART1 |  ETH0 |       |  ETH2 |  ETH3 |  ETH5 |  ETH7 | ETH9  |  |
 +--+-------+-------+-------+-------+-------+-------+-------+-------+--+

Same as this pic
https://habrastorage.org/files/433/d0f/057/433d0f05784f42b6acf9bb777970b1e9.jpg

чт, 30 дек. 2021 г. в 16:00, Vladimir Oltean <[email protected]>:

Quoted 78 lines · Maxim Kiselev
Quoted 6 lines

Fix network interface names for the switch ports according to labels that are written on the front panel of the board. They start from ETH3 and end at ETH10.

Fixes e69eb0824d8c ("powerpc: dts: t1040rdb: add ports for Seville

Ethernet switch")

A Fixes: tag should not wrap on multiple lines.

Quoted 3 lines

---

Sadly I'm not able to confirm or disprove this change right now, because my T1040RDB has a bad DDR memory stick, it seems, so it just randomly hangs.
But I'm pretty sure the Ethernet ports were properly mapped out when I tested them.

Do you have the T1040RDB or the T1040D4RDB? Because the front panel of my T1040RDB looks like this:

 +---------------------------------------------------------------------+
 |                                                                     |
 |  +-------+-------+               +-------+-------+-------+-------+  |
 |  | UART0 |  ETH1 |               |  ETH4 |  ETH6 |  ETH8 | ETH10 |  |
 |  +-------+-------+-------+-------+-------+-------+-------+-------+  |
 |  | UART1 |  ETH0 |  ETH2 |  ETH3 |  ETH5 |  ETH7 |  ETH9 | ETH11 |  |
 +--+-------+-------+-------+-------+-------+-------+-------+-------+--+

Review

Quoted 4 lines
 arch/powerpc/boot/dts/fsl/t1040rdb.dts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
(quoted diff) +0 -0

b/arch/powerpc/boot/dts/fsl/t1040rdb.dts

Quoted 42 lines

index af0c8a6f56138..b6733e7e65805 100644

arch/powerpc/boot/dts/fsl/t1040rdb.dts +4 -5
@@ -119,7 +119,7 @@ &seville_port0 {
      managed = "in-band-status";
      phy-handle = <&phy_qsgmii_0>;
      phy-mode = "qsgmii";
-     label = "ETH5";
+     label = "ETH3";
      status = "okay";
 };
 
@@ -135,7 +135,7 @@ &seville_port2 {
      managed = "in-band-status";
      phy-handle = <&phy_qsgmii_2>;
      phy-mode = "qsgmii";
-     label = "ETH7";
+     label = "ETH5";
      status = "okay";
 };
 
@@ -151,7 +151,7 @@ &seville_port4 {
      managed = "in-band-status";
      phy-handle = <&phy_qsgmii_4>;
      phy-mode = "qsgmii";
-     label = "ETH9";
+     label = "ETH7";
      status = "okay";
 };
 
@@ -167,7 +167,7 @@ &seville_port6 {
      managed = "in-band-status";
      phy-handle = <&phy_qsgmii_6>;
      phy-mode = "qsgmii";
-     label = "ETH11";
+     label = "ETH9";
      status = "okay";
 };
 
--

2.32.0

#5 lore raw

Hi Maxim,

Quoted 1 line · Maxim Kiselev

Here are photos of my boards.

Your patch is OK to change t1040rdb.dts, but please preserve the existing port mappings in a new arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts file.

You will also need to modify the /model and /compatible nodes of the new device tree for Rev A, something like "fsl,T1040RDB-REV-A". Take a look at arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3-rev-a.dts to see an example of what I'd like to be done.

Thanks.

#6 lore raw

PATCH 1/1 powerpc: dts: add device tree for T1040RDB-REV-A

On board rev A, the network interface labels for the switch ports written on the front panel are different than on rev B and later.

This patch introduces a separate device tree for rev A. The main device tree is supposed to cover rev B and later.

---
 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 185 +++++++++++++++++++
 1 file changed, 185 insertions(+)
 create mode 100644 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts new file +185 -0
new file mode 100644
index 0000000000000..f74486ba1d45f
@@ -0,0 +1,185 @@
+/*
+ * T1040RDB Device Tree Source
+ *
+ * Copyright 2014 - 2015 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *	 notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *	 notice, this list of conditions and the following disclaimer in the
+ *	 documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *	 names of its contributors may be used to endorse or promote products
+ *	 derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/include/ "t104xsi-pre.dtsi"
+/include/ "t104xrdb.dtsi"
+
+/ {
+	model = "fsl,T1040RDB-REV-A";
+	compatible = "fsl,T1040RDB-REV-A";
+
+	aliases {
+		phy_sgmii_2 = &phy_sgmii_2;
+	};
+
+	soc@ffe000000 {
+		fman@400000 {
+			ethernet@e0000 {
+				fixed-link = <0 1 1000 0 0>;
+				phy-connection-type = "sgmii";
+			};
+
+			ethernet@e2000 {
+				fixed-link = <1 1 1000 0 0>;
+				phy-connection-type = "sgmii";
+			};
+
+			ethernet@e4000 {
+				phy-handle = <&phy_sgmii_2>;
+				phy-connection-type = "sgmii";
+			};
+
+			mdio@fc000 {
+				phy_sgmii_2: ethernet-phy@3 {
+					reg = <0x03>;
+				};
+
+				/* VSC8514 QSGMII PHY */
+				phy_qsgmii_0: ethernet-phy@4 {
+					reg = <0x4>;
+				};
+
+				phy_qsgmii_1: ethernet-phy@5 {
+					reg = <0x5>;
+				};
+
+				phy_qsgmii_2: ethernet-phy@6 {
+					reg = <0x6>;
+				};
+
+				phy_qsgmii_3: ethernet-phy@7 {
+					reg = <0x7>;
+				};
+
+				/* VSC8514 QSGMII PHY */
+				phy_qsgmii_4: ethernet-phy@8 {
+					reg = <0x8>;
+				};
+
+				phy_qsgmii_5: ethernet-phy@9 {
+					reg = <0x9>;
+				};
+
+				phy_qsgmii_6: ethernet-phy@a {
+					reg = <0xa>;
+				};
+
+				phy_qsgmii_7: ethernet-phy@b {
+					reg = <0xb>;
+				};
+			};
+		};
+	};
+
+	ifc: localbus@ffe124000 {
+		cpld@3,0 {
+			compatible = "fsl,t1040rdb-cpld";
+		};
+	};
+};
+
+#include "t1040si-post.dtsi"
+
+&seville_switch {
+	status = "okay";
+};
+
+&seville_port0 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_0>;
+	phy-mode = "qsgmii";
+	label = "ETH5";
+	status = "okay";
+};
+
+&seville_port1 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_1>;
+	phy-mode = "qsgmii";
+	label = "ETH4";
+	status = "okay";
+};
+
+&seville_port2 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_2>;
+	phy-mode = "qsgmii";
+	label = "ETH7";
+	status = "okay";
+};
+
+&seville_port3 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_3>;
+	phy-mode = "qsgmii";
+	label = "ETH6";
+	status = "okay";
+};
+
+&seville_port4 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_4>;
+	phy-mode = "qsgmii";
+	label = "ETH9";
+	status = "okay";
+};
+
+&seville_port5 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_5>;
+	phy-mode = "qsgmii";
+	label = "ETH8";
+	status = "okay";
+};
+
+&seville_port6 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_6>;
+	phy-mode = "qsgmii";
+	label = "ETH11";
+	status = "okay";
+};
+
+&seville_port7 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_7>;
+	phy-mode = "qsgmii";
+	label = "ETH10";
+	status = "okay";
+};
+
+&seville_port8 {
+	ethernet = <&enet0>;
+	status = "okay";
+};
Signature · 1 line
2.32.0
#7 lore raw

Re: [PATCH] powerpc: dts: add device tree for T1040RDB-REV-A

Hi Maxim,

Quoted 206 lines · Maxim Kiselev

On board rev A, the network interface labels for the switch ports written on the front panel are different than on rev B and later.

This patch introduces a separate device tree for rev A. The main device tree is supposed to cover rev B and later.

---
 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 185 +++++++++++++++++++
 1 file changed, 185 insertions(+)
 create mode 100644 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts new file +185 -0
new file mode 100644
index 0000000000000..f74486ba1d45f
@@ -0,0 +1,185 @@
+/*
+ * T1040RDB Device Tree Source
+ *
+ * Copyright 2014 - 2015 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *	 notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *	 notice, this list of conditions and the following disclaimer in the
+ *	 documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *	 names of its contributors may be used to endorse or promote products
+ *	 derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/include/ "t104xsi-pre.dtsi"
+/include/ "t104xrdb.dtsi"
+
+/ {
+	model = "fsl,T1040RDB-REV-A";
+	compatible = "fsl,T1040RDB-REV-A";
+
+	aliases {
+		phy_sgmii_2 = &phy_sgmii_2;
+	};
+
+	soc@ffe000000 {
+		fman@400000 {
+			ethernet@e0000 {
+				fixed-link = <0 1 1000 0 0>;
+				phy-connection-type = "sgmii";
+			};
+
+			ethernet@e2000 {
+				fixed-link = <1 1 1000 0 0>;
+				phy-connection-type = "sgmii";
+			};
+
+			ethernet@e4000 {
+				phy-handle = <&phy_sgmii_2>;
+				phy-connection-type = "sgmii";
+			};
+
+			mdio@fc000 {
+				phy_sgmii_2: ethernet-phy@3 {
+					reg = <0x03>;
+				};
+
+				/* VSC8514 QSGMII PHY */
+				phy_qsgmii_0: ethernet-phy@4 {
+					reg = <0x4>;
+				};
+
+				phy_qsgmii_1: ethernet-phy@5 {
+					reg = <0x5>;
+				};
+
+				phy_qsgmii_2: ethernet-phy@6 {
+					reg = <0x6>;
+				};
+
+				phy_qsgmii_3: ethernet-phy@7 {
+					reg = <0x7>;
+				};
+
+				/* VSC8514 QSGMII PHY */
+				phy_qsgmii_4: ethernet-phy@8 {
+					reg = <0x8>;
+				};
+
+				phy_qsgmii_5: ethernet-phy@9 {
+					reg = <0x9>;
+				};
+
+				phy_qsgmii_6: ethernet-phy@a {
+					reg = <0xa>;
+				};
+
+				phy_qsgmii_7: ethernet-phy@b {
+					reg = <0xb>;
+				};
+			};
+		};
+	};
+
+	ifc: localbus@ffe124000 {
+		cpld@3,0 {
+			compatible = "fsl,t1040rdb-cpld";
+		};
+	};
+};
+
+#include "t1040si-post.dtsi"
+
+&seville_switch {
+	status = "okay";
+};
+
+&seville_port0 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_0>;
+	phy-mode = "qsgmii";
+	label = "ETH5";
+	status = "okay";
+};
+
+&seville_port1 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_1>;
+	phy-mode = "qsgmii";
+	label = "ETH4";
+	status = "okay";
+};
+
+&seville_port2 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_2>;
+	phy-mode = "qsgmii";
+	label = "ETH7";
+	status = "okay";
+};
+
+&seville_port3 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_3>;
+	phy-mode = "qsgmii";
+	label = "ETH6";
+	status = "okay";
+};
+
+&seville_port4 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_4>;
+	phy-mode = "qsgmii";
+	label = "ETH9";
+	status = "okay";
+};
+
+&seville_port5 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_5>;
+	phy-mode = "qsgmii";
+	label = "ETH8";
+	status = "okay";
+};
+
+&seville_port6 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_6>;
+	phy-mode = "qsgmii";
+	label = "ETH11";
+	status = "okay";
+};
+
+&seville_port7 {
+	managed = "in-band-status";
+	phy-handle = <&phy_qsgmii_7>;
+	phy-mode = "qsgmii";
+	label = "ETH10";
+	status = "okay";
+};
+
+&seville_port8 {
+	ethernet = <&enet0>;
+	status = "okay";
+};
Signature · 1 line
2.32.0

This is pretty much not the patch I was expecting to see. I was expecting to see arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts containing only this:

/include/ t1040rdb.dts

/ {
	model = "fsl,T1040RDB-REV-A";
	compatible = "fsl,T1040RDB-REV-A";
};
&seville_port0 {
	label = "ETH5";
};
&seville_port2 {
	label = "ETH7";
};
&seville_port4 {
	label = "ETH9";
};
&seville_port6 {
	label = "ETH11";
};

Also, I don't see the changes from your original patch applied to the main t1040rdb.dts. Did you forget to include them?

author
#8 lore raw

PATCH v2 1/1 powerpc: dts: t1040rdb: fix ports names for Seville Ethernet switch

From: Maxim Kiselev <[email protected]>

On board rev A, the network interface labels for the switch ports written on the front panel are different than on rev B and later.

This patch fixes network interface names for the switch ports according to labels that are written on the front panel of the board rev B. They start from ETH3 and end at ETH10.

This patch also introduces a separate device tree for rev A. The main device tree is supposed to cover rev B and later.

---
 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 30 ++++++++++++++++++++
 arch/powerpc/boot/dts/fsl/t1040rdb.dts       |  8 +++---
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts new file +30 -0
new file mode 100644
index 00000000000..2203286b64b
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * T1040RDB-REV-A Device Tree Source
+ *
+ * Copyright 2014 - 2015 Freescale Semiconductor Inc.
+ *
+ */
+
+/include/ "t1040rdb.dts"
+
+/ {
+	model = "fsl,T1040RDB-REV-A";
+	compatible = "fsl,T1040RDB-REV-A";
+};
+
+&seville_port0 {
+	label = "ETH5";
+};
+
+&seville_port2 {
+	label = "ETH7";
+};
+
+&seville_port4 {
+	label = "ETH9";
+};
+
+&seville_port6 {
+	label = "ETH11";
+};
arch/powerpc/boot/dts/fsl/t1040rdb.dts +4 -4
index af0c8a6f561..b6733e7e658 100644
@@ -119,7 +119,7 @@ &seville_port0 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_0>;
 	phy-mode = "qsgmii";
-	label = "ETH5";
+	label = "ETH3";
 	status = "okay";
 };
 
@@ -135,7 +135,7 @@ &seville_port2 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_2>;
 	phy-mode = "qsgmii";
-	label = "ETH7";
+	label = "ETH5";
 	status = "okay";
 };
 
@@ -151,7 +151,7 @@ &seville_port4 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_4>;
 	phy-mode = "qsgmii";
-	label = "ETH9";
+	label = "ETH7";
 	status = "okay";
 };
 
@@ -167,7 +167,7 @@ &seville_port6 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_6>;
 	phy-mode = "qsgmii";
-	label = "ETH11";
+	label = "ETH9";
 	status = "okay";
 };
 
Signature · 1 line
2.32.0 (Apple Git-132)
Reviewed-by on v2 1/1
#9 lore raw
Quoted 9 lines · Maxim

From: Maxim Kiselev <[email protected]>

On board rev A, the network interface labels for the switch ports written on the front panel are different than on rev B and later.

This patch fixes network interface names for the switch ports according to labels that are written on the front panel of the board rev B. They start from ETH3 and end at ETH10.

Quoted 6 lines

This patch also introduces a separate device tree for rev A. The main device tree is supposed to cover rev B and later.

---

Fixes e69eb0824d8c ("powerpc: dts: t1040rdb: add ports for Seville Ethernet switch")
#10 lore raw
In reply to Maxim
Quoted 12 lines · Maxim

From: Maxim Kiselev <[email protected]>

On board rev A, the network interface labels for the switch ports written on the front panel are different than on rev B and later.

This patch fixes network interface names for the switch ports according to labels that are written on the front panel of the board rev B. They start from ETH3 and end at ETH10.

This patch also introduces a separate device tree for rev A. The main device tree is supposed to cover rev B and later.

Quoted 7 lines
---
 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 30 ++++++++++++++++++++
 arch/powerpc/boot/dts/fsl/t1040rdb.dts       |  8 +++---
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts

I applied this but it generated errors, you should have got some reports from the kernel build robot.

cheers

#11 lore raw

PATCH v3 1/1 powerpc: dts: t1040rdb: fix ports names for Seville Ethernet switch

On board rev A, the network interface labels for the switch ports written on the front panel are different than on rev B and later.

This patch fixes network interface names for the switch ports according to labels that are written on the front panel of the board rev B. They start from ETH3 and end at ETH10.

This patch also introduces a separate device tree for rev A. The main device tree is supposed to cover rev B and later.

Fixes e69eb0824d8c ("powerpc: dts: t1040rdb: add ports for Seville Ethernet switch")

---
Here is the fix for the error in t1040rdb-rev-a.dts caused by containing '#include' directive inside '/include/'

---
 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 30 ++++++++++++++++++++
 arch/powerpc/boot/dts/fsl/t1040rdb.dts       |  8 +++---
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts new file +30 -0
new file mode 100644
index 0000000000000..73f8c998c64df
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * T1040RDB-REV-A Device Tree Source
+ *
+ * Copyright 2014 - 2015 Freescale Semiconductor Inc.
+ *
+ */
+
+#include "t1040rdb.dts"
+
+/ {
+	model = "fsl,T1040RDB-REV-A";
+	compatible = "fsl,T1040RDB-REV-A";
+};
+
+&seville_port0 {
+	label = "ETH5";
+};
+
+&seville_port2 {
+	label = "ETH7";
+};
+
+&seville_port4 {
+	label = "ETH9";
+};
+
+&seville_port6 {
+	label = "ETH11";
+};
arch/powerpc/boot/dts/fsl/t1040rdb.dts +4 -4
index af0c8a6f56138..b6733e7e65805 100644
@@ -119,7 +119,7 @@ &seville_port0 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_0>;
 	phy-mode = "qsgmii";
-	label = "ETH5";
+	label = "ETH3";
 	status = "okay";
 };
 
@@ -135,7 +135,7 @@ &seville_port2 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_2>;
 	phy-mode = "qsgmii";
-	label = "ETH7";
+	label = "ETH5";
 	status = "okay";
 };
 
@@ -151,7 +151,7 @@ &seville_port4 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_4>;
 	phy-mode = "qsgmii";
-	label = "ETH9";
+	label = "ETH7";
 	status = "okay";
 };
 
@@ -167,7 +167,7 @@ &seville_port6 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_6>;
 	phy-mode = "qsgmii";
-	label = "ETH11";
+	label = "ETH9";
 	status = "okay";
 };
 
Signature · 1 line
2.32.0
#12 lore raw
Quoted 8 lines · Maxim Kiselev

On board rev A, the network interface labels for the switch ports written on the front panel are different than on rev B and later.

This patch fixes network interface names for the switch ports according to labels that are written on the front panel of the board rev B. They start from ETH3 and end at ETH10.

[...]

Applied to powerpc/next.

[1/1] powerpc: dts: t1040rdb: fix ports names for Seville Ethernet switch

      https://git.kernel.org/powerpc/c/5ebb74749202a25da4b3cc2eb15470225a05527c

cheers