Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     devicetree@vger.kernel.org
Cc:     netdev@vger.kernel.org, Shawn Guo <shawnguo@kernel.org>,
        Li Yang <leoyang.li@nxp.com>, Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Michael Walle <michael@walle.cc>
Subject: [PATCH devicetree] arm64: dts: ls1028a-rdb: add more ethernet aliases
Date:   Tue,  6 Sep 2022 00:24:58 +0300
Message-Id: <20220905212458.1549179-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?dHO03HSZ8luKYW8KtA9SGufsZzE6WQEZvR8F+z0aT03jeDZUW5jJY6sRd8g0?=
 =?us-ascii?Q?Yr7HM++VvCgV81lbHSQPE2/dsjsCR6lifcM6Iae1fLhyuKgqw2VD5PVMihaX?=
 =?us-ascii?Q?I1n5acfuux/0ejBdJliX2AQW508aDDU5GZMSZBB9AFjQ0Krk1Ui48XPqDdcH?=
 =?us-ascii?Q?SWU2LXuouzOEZCI0PS49dk20VNfCD5ObhzkjNdhSOwo33vHVnXkinvreSaTQ?=
 =?us-ascii?Q?/viich7VsckbKSrRy14VaN/W3wUNK2MMheTxMZrXfMaPRScd56qlueH8asBv?=
 =?us-ascii?Q?voFU/NQr512wgC5V6n8UqHLDfA8TwSUfMSxEsfGdTMq40SIm9RCPH96h3JHG?=
 =?us-ascii?Q?fO8qwpJ3KMqWXgy+S6zHxekNjIIS5uwcDUP93NT4BjBjF+tP18BSstD0lx9k?=
 =?us-ascii?Q?zFo/lLIQp5nVFxAvc5ESi4N8yCrfcBECTYWgGq9aWaazPV/1qsfsmMr+x5kz?=
 =?us-ascii?Q?IAPPZRH9wRn7ffty7wVmyDlDONw1Wy/qhRjMeW1Reu092FRrlslKxxoCYuSL?=
 =?us-ascii?Q?SP+4NwaKHm/6gU6EfndkBKEiIK2CGrfLy0Od5kt1psQiVh/+seO+hdcSCWN0?=
 =?us-ascii?Q?q6/wS+LVLtnONHEt5DfnQvcfJcPX+I1bMAactF0uYxKIJ9SBS+lfHBP5+mhs?=
 =?us-ascii?Q?KLf6hQr4PuoLr9S58e68yR3hDugtUTjlSc3+MUba+UMnyQic+tyaiL+RGOUY?=
 =?us-ascii?Q?80TsrvxAu3TD89MaCXVGoCFrZ3aRFm2kAwO1LsxmLk7Nxvo46fxkfOABwxzS?=
 =?us-ascii?Q?KugVEfoLJFejQWCJxZybrhaDBkop0ecRo98PacJYx3ea+aJURLUmsJXnaPYs?=
 =?us-ascii?Q?dKFVKLY37LMNxh0j7YbS4vm3Y6gwIweKRAFjX2Grqj6yrhPGtpRfUioTxQP+?=
 =?us-ascii?Q?hQFqAYkRiQv8HnQenFE/FnYDz5p2BZI673a0Dn3QKgIzISZ83yugu3SgGYN/?=
 =?us-ascii?Q?zdwjtNyJdyNpFfKcvEjWEU2VfIXmM6tWGswHr1fvqw3LJuite9knIWSEwMh5?=
 =?us-ascii?Q?NVRK5S26vIP5qwNGShx1u/ZaMe4fY9++y6KNN32+HJMmmL4IPb9XGDF9lBQR?=
 =?us-ascii?Q?MjY7duUpc28UJSgUmMnqv6mk24nYlPrlkJtttzWxsN0RTbocVTFVJtlPLdeW?=
 =?us-ascii?Q?N7WA0rMx5YH3E7Jy20hr4gO0TNmtUvCbnZXIJT8N+kaSUpypYYlW8XPmGv2L?=
 =?us-ascii?Q?OYh096hZfc3Ou8YjgGdyrT9cEXWW/BLjqm9oiXYnn57Rj4XiiNC7mpkR5F27?=
 =?us-ascii?Q?aj6bvC2YaLCEqxxNEtcK/C5ZLh22AS/oKBc6XM7/qIIW4MhEdTV1IxEu2fyf?=
 =?us-ascii?Q?QUs0H4uIUrXxMVk3XGYH7RnAtSIXdhYEJHqLayi0ppWejdJgwRmrzv2jDCvr?=
 =?us-ascii?Q?ODnGSvbCVEgagQE7ElQFq/k+v9Q3Lpz4kBSjcptN59mqTu43Ty+nX034bk++?=
 =?us-ascii?Q?ThLy7Kzc+TpKhta/B54jGoQ0PJE+ZoXah+c+AxkIZaOdn6XF0VwQBShB7Amb?=
 =?us-ascii?Q?qw3It5FqctsD8678HfL6j+kFU67bXFcW7elTO+CiHJJL6w2f5UgY6eVMtJ91?=
 =?us-ascii?Q?AV4Bw2+d9pxA8sKxobf+mcd7I+Yr0McXScx4M6aPhEAamYBsuQUNHQnlpGhA?=
 =?us-ascii?Q?Yg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: da8a36c0-a548-4d29-c9dc-08da8f851e27
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2022 21:25:12.7567
 (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: j/h/eyVSsdOIGngHw1HLzEbAE+gOTxoKRvZ/ITMH1moTbYXCc8V+Hw9KjdxArUCtHHdOA6yM/K5algSxojCZtQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5020
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Commit "arm64: dts: ls1028a: enable swp5 and eno3 for all boards" which
Shawn declared as applied, but for which I can't find a sha1sum, has
enabled a new Ethernet port on the LS1028A-RDB (&enetc_port3), but
U-Boot, which passes a MAC address to Linux' device tree through the
/aliases node, fails to do this for this newly enabled port.

Fix that by adding more ethernet aliases in the only
backwards-compatible way possible: at the end of the current list.

And since it is possible to very easily convert either swp4 or swp5 to
DSA user ports now (which have a MAC address of their own), using these
U-Boot commands:

=> fdt addr $fdt_addr_r
=> fdt rm /soc/pcie@1f0000000/ethernet-switch@0,5/ports/port@4 ethernet

it would be good if those DSA user ports (swp4, swp5) gained a valid MAC
address from U-Boot as well. In order for that to work properly,
provision two more ethernet aliases for &mscc_felix_port{4,5} as well.

The resulting ordering is slightly unusual, but to me looks more natural
than eno0, eno2, swp0, swp1, swp2, swp3, eno3, swp4, swp5.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
index e33725c60169..ecd2c1ea177f 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
@@ -29,6 +29,9 @@ aliases {
 		ethernet3 = &mscc_felix_port1;
 		ethernet4 = &mscc_felix_port2;
 		ethernet5 = &mscc_felix_port3;
+		ethernet6 = &mscc_felix_port4;
+		ethernet7 = &mscc_felix_port5;
+		ethernet8 = &enetc_port3;
 	};
 
 	chosen {
-- 
2.34.1