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")
Signed-off-by: Maxim Kiselev <bigunclemax@gmail.com>
Reviewed-by: Maxim Kochetkov <fido_max@inbox.ru>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220121091447.3412907-1-bigunclemax@gmail.com

diff --git a/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts b/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
new file mode 100644 (file)
index 0000000..73f8c99
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
@@ -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";
+};

diff --git a/arch/powerpc/boot/dts/fsl/t1040rdb.dts b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
index af0c8a6..b6733e7 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t1040rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
@@ -119,7 +119,7 @@
        managed = "in-band-status";
        phy-handle = <&phy_qsgmii_0>;
        phy-mode = "qsgmii";
-       label = "ETH5";
+       label = "ETH3";
        status = "okay";
 };
 
@@ -135,7 +135,7 @@
        managed = "in-band-status";
        phy-handle = <&phy_qsgmii_2>;
        phy-mode = "qsgmii";
-       label = "ETH7";
+       label = "ETH5";
        status = "okay";
 };
 
@@ -151,7 +151,7 @@
        managed = "in-band-status";
        phy-handle = <&phy_qsgmii_4>;
        phy-mode = "qsgmii";
-       label = "ETH9";
+       label = "ETH7";
        status = "okay";
 };
 
@@ -167,7 +167,7 @@
        managed = "in-band-status";
        phy-handle = <&phy_qsgmii_6>;
        phy-mode = "qsgmii";
-       label = "ETH11";
+       label = "ETH9";
        status = "okay";
 };