From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     Michael Ellerman <mpe@ellerman.id.au>,
        linuxppc-dev@lists.ozlabs.org
Cc:     Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Nicholas Piggin <npiggin@gmail.com>,
        Christophe Leroy <christophe.leroy@csgroup.eu>,
        Maxim Kochetkov <fido_max@inbox.ru>,
        Maxim Kiselev <bigunclemax@gmail.com>,
        devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
        netdev@vger.kernel.org
Subject: [PATCH 2/2] powerpc: dts: t1040rdb: enable both CPU ports
Date:   Fri, 24 Feb 2023 17:59:40 +0200
Message-Id: <20230224155941.514638-3-vladimir.oltean@nxp.com>
In-Reply-To: <20230224155941.514638-1-vladimir.oltean@nxp.com>
References: <20230224155941.514638-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Gxb/AyoRxXN5cKVg4JzCofoXtQwj0RHpks+mOM0LViMuvpe3POSpuhF4X4WY?=
 =?us-ascii?Q?uUghDdM7O3McDrhqFCJwCXevgMvbp5gCGtS0V1FQkUoYe4zmIE+nHGdnwz5X?=
 =?us-ascii?Q?v9+Gvdt7FOrHPH+Af153ugW2KFORsmm8BTibN2eVtVWhkiCQKeRQ4VrtA9Nd?=
 =?us-ascii?Q?vxgdBRU4FKN2yzLxgPq2C2giEXYdLFYNVmbHgzG1dwxyA9KgtwMlqY1LGthM?=
 =?us-ascii?Q?xYSbm4Ix58qZp4zgD0LyIcDPvG7BU8GfboMOXWVhdztH404F2JG3LID20loE?=
 =?us-ascii?Q?ZR9SU3NIhVyg8w8GJrXnGm/BcrR33/SLoRkZi1EcNxfGKuExNVQcEOwbfPbO?=
 =?us-ascii?Q?DOFMjJxP8uHQKGWyKPoS7OpwNpa6H+ds/P0xeq5YFQ+11pUuNCtIvHXdr1SZ?=
 =?us-ascii?Q?xl5fsQSeWPjk7CN+xzfQQCMBsSkwkJyi/mhHQVvR+D/7RR2OaQMWPUWV7+hr?=
 =?us-ascii?Q?rf/DhhZRUcD/cEpQm5By0WkdVgB5hvlB1P4E3zW7i3q9luUNcQ1OuFC9EwW/?=
 =?us-ascii?Q?I4c5wYwrOj+oFV+lvTsdtayi6Re/Xudjp9AN9O1bo44aPCZunshHJ0Yoog3A?=
 =?us-ascii?Q?c17oryXw/u+GSpvZuG8pbWvl8HVSCqCkHJFMeX5IQBg4/xIo63XVQ3obsC4r?=
 =?us-ascii?Q?U1WVJny+WhbW+DA9Nr8j3rBAclNJQDrkpe7RpH2Z4mJIqHy/vAUaZopjSp4+?=
 =?us-ascii?Q?iBRN/u2NZkLxHAPh6bZ4wLIUQnj3+quDDt67FeakQB3+Gd13nYG56MRDavzI?=
 =?us-ascii?Q?Mr60hYdSz0wtdqHDkqkrV8COsa8v/bBCQmPGEuziNRpBsKHnSZZIKS/W4tCs?=
 =?us-ascii?Q?fHgStxbY38zBK53y5pb18jIQHNcRge3rKcpsvGiOd/vy6Fa7xTn6JVc0zUvF?=
 =?us-ascii?Q?Pk84QH3vMIS/C1KAn2Rb2NmodRLoLJGBMmxwTNuT+7LmgVqVPEWtzGW7VNOG?=
 =?us-ascii?Q?/1Zw/hAjocKh50QeoFK/QjrTS3CyEuudDtW/5+oKiBrkd7D5nTMK+PxX9yUq?=
 =?us-ascii?Q?oE14RuW+/AKBdeii488u3obJrUPF4aac9p3yh4OpvP3l9HiduUcXlsrEmhDL?=
 =?us-ascii?Q?Jatly7aRjcrm18/IXZhlRAy0qPRCWf0LrVEu8MzyuuYJ0/YOheP+BT5KaxH7?=
 =?us-ascii?Q?PIzNmDrY+jS9rKHFq49Cpm3qow7E8Cnr8IASt9V+SZN8HE4WpQ4RGDf+xmjj?=
 =?us-ascii?Q?NUdGLixra4FFsldNYmX8X9k+3uQwu13TIjoZk6ZLbSZQ/a1l/32qiMX5mWIR?=
 =?us-ascii?Q?BO/FHr0oOE3/HLHMNGnpf1T7UW5wlzDg9/drgL3PfLmJcYhFzyzuksZKinTL?=
 =?us-ascii?Q?ZR4jqqQkd6qVX98Fw4govbUsovbD7d6T2/EGZItpZgPISRt/hbm6nWX83s+A?=
 =?us-ascii?Q?fp/febidr6XhDXMt3EUFeIQE6lAPLtx6CxS7m6uk45TV0keG5C3KUIy+Ezvl?=
 =?us-ascii?Q?sgXZgfKYTvCPMdAEiFFHqeJq8+42KTOX7D5nsyhSyxQJfCRAWrMMEbpmwXvP?=
 =?us-ascii?Q?k0Wiczc6s07GH7wBoS1TX9YlRayLQ4jsR7ewSZJdp2d+uNaje908Rx9d2pMU?=
 =?us-ascii?Q?okvR8/XVyRT0tDiVbvZ8MtzNtp4wSBEZmq63sAZU0PMcn73jVdiKa8yfumP6?=
 =?us-ascii?Q?bg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 596ce244-5209-4f9b-5ddb-08db16802e9e
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2023 15:59:59.8531
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: roWyg8Scf939uM/C1LFamgfEWGtcsyGcFfKoWQ6sl0/0MWW16U5VpB/PGTKFaKCLDs3farSe/t1/gE7zUFwdKA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB8003
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Since commit eca70102cfb1 ("net: dsa: felix: add support for changing
DSA master") included in kernel v6.1, the driver supports 2 CPU ports,
and they can be put in a LAG, for example (see
Documentation/networking/dsa/configuration.rst for more details).

Defining the second CPU port in the device tree should not cause any
compatibility issue, because the default CPU port was &seville_port8
before this change, and still is &seville_port8 now (the numerically
first CPU port is used by default).

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 arch/powerpc/boot/dts/fsl/t1040rdb.dts      | 5 ++++-
 arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/boot/dts/fsl/t1040rdb.dts b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
index b6733e7e6580..dd3aab81e9de 100644
--- a/arch/powerpc/boot/dts/fsl/t1040rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
@@ -180,6 +180,9 @@ &seville_port7 {
 };
 
 &seville_port8 {
-	ethernet = <&enet0>;
+	status = "okay";
+};
+
+&seville_port9 {
 	status = "okay";
 };
diff --git a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
index f58eb820eb5e..ad0ab33336b8 100644
--- a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
@@ -686,6 +686,7 @@ seville_port7: port@7 {
 			seville_port8: port@8 {
 				reg = <8>;
 				phy-mode = "internal";
+				ethernet = <&enet0>;
 				status = "disabled";
 
 				fixed-link {
@@ -697,6 +698,7 @@ fixed-link {
 			seville_port9: port@9 {
 				reg = <9>;
 				phy-mode = "internal";
+				ethernet = <&enet1>;
 				status = "disabled";
 
 				fixed-link {
-- 
2.34.1