]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
mvebu: cortex-a53: fix Methode eDPU migration to upstream DTS 21739/head
authorRobert Marko <robert.marko@sartura.hr>
Tue, 27 Jan 2026 12:53:37 +0000 (13:53 +0100)
committerRobert Marko <robert.marko@sartura.hr>
Wed, 28 Jan 2026 09:19:18 +0000 (10:19 +0100)
Migration of the eDPU DTS to upstream one broke the eDPU plus model
since the required ethernet aliases are missing and U-Boot then cannot
find the required ethernet nodes.

So, after sending the required fix upstream, lets apply it in OpenWrt
as well.

Fixes: 9852dda4105c ("mvebu: move DTS diff into a patch for Methode uDPU")
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
target/linux/mvebu/patches-6.12/101-arm64-dts-marvell-uDPU-add-ethernet-aliases.patch [new file with mode: 0644]
target/linux/mvebu/patches-6.12/322-arm64-dts-marvell-specity-phy-mode-2500base-x-for-Me.patch

diff --git a/target/linux/mvebu/patches-6.12/101-arm64-dts-marvell-uDPU-add-ethernet-aliases.patch b/target/linux/mvebu/patches-6.12/101-arm64-dts-marvell-uDPU-add-ethernet-aliases.patch
new file mode 100644 (file)
index 0000000..8530f2f
--- /dev/null
@@ -0,0 +1,33 @@
+From 4b23f8aecf46484cefb5563b0c255ac4e0cd52f9 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robert.marko@sartura.hr>
+Date: Tue, 27 Jan 2026 13:24:59 +0100
+Subject: [PATCH] arm64: dts: marvell: uDPU: add ethernet aliases
+
+On eDPU plus, which is an updated revision of eDPU which uses an external
+MV88E6361 switch we are relying on U-Boot to detect the board, and then
+enable and disable the required nodes for that revision.
+
+However, it seems that I missed adding the required aliases for ethernet
+controllers, and this worked as in OpenWrt we had added those locally.
+
+Cc: stable@vger.kernel.org
+Fixes: 660b8b2f3944 ("arm64: dts: marvell: eDPU: add support for version with external switch")
+Signed-off-by: Robert Marko <robert.marko@sartura.hr>
+---
+ arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi
++++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi
+@@ -15,6 +15,11 @@
+ #include "armada-372x.dtsi"
+ / {
++      aliases {
++              ethernet0 = &eth0;
++              ethernet1 = &eth1;
++      };
++
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
index cf23acfa58fe845856d96e791072a1007a22a43c..c11be8e2e52d78f3816e93d6e9506b2b34122a17 100644 (file)
@@ -15,19 +15,7 @@ Signed-off-by: Stefan Kalscheuer <stefan@stklcode.de>
 
 --- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 +++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
-@@ -8,6 +8,11 @@
-       model = "Methode uDPU Board";
-       compatible = "methode,udpu", "marvell,armada3720", "marvell,armada3710";
-+      aliases {
-+              ethernet0 = &eth0;
-+              ethernet1 = &eth1;
-+      };
-+
-       sfp_eth0: sfp-eth0 {
-               compatible = "sff,sfp";
-               i2c-bus = <&i2c0>;
-@@ -37,6 +42,10 @@
+@@ -37,6 +37,10 @@
  };
  
  &eth0 {