mvebu: move DTS diff into a patch for Methode uDPU

Upstream DTS is almost identical to our copy. Move network aliases and
phy-mode into a patch and drop the full copy.

Signed-off-by: Stefan Kalscheuer <stefan@stklcode.de>
Link: https://github.com/openwrt/openwrt/pull/19786
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
deleted file mode 100644 (file)
index 186a5e7..0000000
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+++ /dev/null
@@ -1,46 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-
-/dts-v1/;
-
-#include "armada-3720-uDPU.dtsi"
-
-/ {
-       model = "Methode uDPU Board";
-       compatible = "methode,udpu", "marvell,armada3720", "marvell,armada3710";
-
-       sfp_eth0: sfp-eth0 {
-               compatible = "sff,sfp";
-               i2c-bus = <&i2c0>;
-               los-gpio = <&gpiosb 2 GPIO_ACTIVE_HIGH>;
-               mod-def0-gpio = <&gpiosb 3 GPIO_ACTIVE_LOW>;
-               tx-disable-gpio = <&gpiosb 4 GPIO_ACTIVE_HIGH>;
-               tx-fault-gpio = <&gpiosb 5 GPIO_ACTIVE_HIGH>;
-               maximum-power-milliwatt = <3000>;
-       };
-};
-
-&pinctrl_nb {
-       i2c1_recovery_pins: i2c1-recovery-pins {
-               groups = "i2c1";
-               function = "gpio";
-       };
-};
-
-&i2c0 {
-       status = "okay";
-       pinctrl-names = "default", "recovery";
-       pinctrl-0 = <&i2c1_pins>;
-       pinctrl-1 = <&i2c1_recovery_pins>;
-       /delete-property/mrvl,i2c-fast-mode;
-       scl-gpios = <&gpionb 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-       sda-gpios = <&gpionb 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-};
-
-&eth0 {
-       phy-mode = "2500base-x";
-       sfp = <&sfp_eth0>;
-};
-
-&eth1 {
-       phy-mode = "2500base-x";
-};

diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi
deleted file mode 100644 (file)
index bc8d1f1..0000000
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi
+++ /dev/null
@@ -1,165 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Device tree for the uDPU board.
- * Based on Marvell Armada 3720 development board (DB-88F3720-DDR3)
- * Copyright (C) 2016 Marvell
- * Copyright (C) 2019 Methode Electronics
- * Copyright (C) 2019 Telus
- *
- * Vladimir Vid <vladimir.vid@sartura.hr>
- */
-
-/dts-v1/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include "armada-372x.dtsi"
-
-/ {
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
-       };
-
-       aliases {
-               ethernet0 = &eth0;
-               ethernet1 = &eth1;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led-power1 {
-                       label = "udpu:green:power";
-                       gpios = <&gpionb 11 GPIO_ACTIVE_LOW>;
-               };
-
-               led-power2 {
-                       label = "udpu:red:power";
-                       gpios = <&gpionb 12 GPIO_ACTIVE_LOW>;
-               };
-
-               led-network1 {
-                       label = "udpu:green:network";
-                       gpios = <&gpionb 13 GPIO_ACTIVE_LOW>;
-               };
-
-               led-network2 {
-                       label = "udpu:red:network";
-                       gpios = <&gpionb 14 GPIO_ACTIVE_LOW>;
-               };
-
-               led-alarm1 {
-                       label = "udpu:green:alarm";
-                       gpios = <&gpionb 15 GPIO_ACTIVE_LOW>;
-               };
-
-               led-alarm2 {
-                       label = "udpu:red:alarm";
-                       gpios = <&gpionb 16 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-       sfp_eth1: sfp-eth1 {
-               compatible = "sff,sfp";
-               i2c-bus = <&i2c1>;
-               los-gpio = <&gpiosb 7 GPIO_ACTIVE_HIGH>;
-               mod-def0-gpio = <&gpiosb 8 GPIO_ACTIVE_LOW>;
-               tx-disable-gpio = <&gpiosb 9 GPIO_ACTIVE_HIGH>;
-               tx-fault-gpio = <&gpiosb 10 GPIO_ACTIVE_HIGH>;
-               maximum-power-milliwatt = <3000>;
-       };
-};
-
-&sdhci0 {
-       status = "okay";
-       bus-width = <8>;
-       mmc-ddr-1_8v;
-       mmc-hs400-1_8v;
-       marvell,pad-type = "fixed-1-8v";
-       non-removable;
-       no-sd;
-       no-sdio;
-};
-
-&spi0 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&spi_quad_pins>;
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <54000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "firmware";
-                               reg = <0x0 0x180000>;
-                       };
-
-                       partition@180000 {
-                               label = "u-boot-env";
-                               reg = <0x180000 0x10000>;
-                       };
-               };
-       };
-};
-
-&pinctrl_nb {
-       i2c2_recovery_pins: i2c2-recovery-pins {
-               groups = "i2c2";
-               function = "gpio";
-       };
-};
-
-&i2c1 {
-       status = "okay";
-       pinctrl-names = "default", "recovery";
-       pinctrl-0 = <&i2c2_pins>;
-       pinctrl-1 = <&i2c2_recovery_pins>;
-       /delete-property/mrvl,i2c-fast-mode;
-       scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-       sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-
-       temp-sensor@48 {
-               compatible = "ti,tmp75c";
-               reg = <0x48>;
-       };
-
-       temp-sensor@49 {
-               compatible = "ti,tmp75c";
-               reg = <0x49>;
-       };
-};
-
-&eth0 {
-       status = "okay";
-       managed = "in-band-status";
-       phys = <&comphy1 0>;
-};
-
-&eth1 {
-       phy-mode = "sgmii";
-       status = "okay";
-       managed = "in-band-status";
-       phys = <&comphy0 1>;
-       sfp = <&sfp_eth1>;
-};
-
-&usb3 {
-       status = "okay";
-       phys = <&usb2_utmi_otg_phy>;
-       phy-names = "usb2-utmi-otg-phy";
-};
-
-&uart0 {
-       status = "okay";
-};

diff --git a/target/linux/mvebu/patches-6.12/322-arm64-dts-marvell-specity-phy-mode-2500base-x-for-Me.patch b/target/linux/mvebu/patches-6.12/322-arm64-dts-marvell-specity-phy-mode-2500base-x-for-Me.patch
new file mode 100644 (file)
index 0000000..cf23acf
--- /dev/null
+++ b/target/linux/mvebu/patches-6.12/322-arm64-dts-marvell-specity-phy-mode-2500base-x-for-Me.patch
@@ -0,0 +1,41 @@
+From cb1103762449c0d8097d58c701a06118e417a50e Mon Sep 17 00:00:00 2001
+From: Stefan Kalscheuer <stefan@stklcode.de>
+Date: Fri, 15 Aug 2025 14:48:54 +0200
+Subject: [PATCH] arm64: dts: marvell: specity phy-mode "2500base-x" for
+ Methode uDPU
+
+In OpenWRT we used to have a copy of the DTS with "2500base-x" instead
+of "sgmii" for both ethernet nodes. Apply this change to the upstream
+DTS and omit the full-copy.
+
+Signed-off-by: Stefan Kalscheuer <stefan@stklcode.de>
+---
+ arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+--- 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 @@
+ };
+ 
+ &eth0 {
+-      phy-mode = "sgmii";
++      phy-mode = "2500base-x";
+       sfp = <&sfp_eth0>;
+ };
++
++&eth1 {
++      phy-mode = "2500base-x";
++};