[PATCH v5 1/3] arm: mvebu: dts: sync DTS

[PATCH v5 1/3] arm: mvebu: dts: sync DTS

[Robert Marko]

Update the uDPU DTS to the version that is pending upstream [1][2][3][4].

[1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-4-robert.marko@sartura.hr/
[2] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-5-robert.marko@sartura.hr/
[3] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-6-robert.marko@sartura.hr/
[4] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-7-robert.marko@sartura.hr/

Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
 arch/arm/dts/armada-3720-uDPU.dts | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts
index 1f534c0c65..f21a855fc6 100644
--- a/arch/arm/dts/armada-3720-uDPU.dts
+++ b/arch/arm/dts/armada-3720-uDPU.dts
@@ -16,7 +16,7 @@
 
 / {
 	model = "Methode uDPU Board";
-	compatible = "methode,udpu", "marvell,armada3720";
+	compatible = "methode,udpu", "marvell,armada3720", "marvell,armada3710";
 
 	chosen {
 		stdout-path = "serial0:115200n8";
@@ -28,35 +28,34 @@
 	};
 
 	leds {
-		pinctrl-names = "default";
 		compatible = "gpio-leds";
 
-		power1 {
+		led-power1 {
 			label = "udpu:green:power";
 			gpios = <&gpionb 11 GPIO_ACTIVE_LOW>;
 		};
 
-		power2 {
+		led-power2 {
 			label = "udpu:red:power";
 			gpios = <&gpionb 12 GPIO_ACTIVE_LOW>;
 		};
 
-		network1 {
+		led-network1 {
 			label = "udpu:green:network";
 			gpios = <&gpionb 13 GPIO_ACTIVE_LOW>;
 		};
 
-		network2 {
+		led-network2 {
 			label = "udpu:red:network";
 			gpios = <&gpionb 14 GPIO_ACTIVE_LOW>;
 		};
 
-		alarm1 {
+		led-alarm1 {
 			label = "udpu:green:alarm";
 			gpios = <&gpionb 15 GPIO_ACTIVE_LOW>;
 		};
 
-		alarm2 {
+		led-alarm2 {
 			label = "udpu:red:alarm";
 			gpios = <&gpionb 16 GPIO_ACTIVE_LOW>;
 		};
@@ -99,7 +98,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi_quad_pins>;
 
-	spi-flash@0 {
+	flash@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <54000000>;
@@ -153,14 +152,12 @@
 	scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 
-	nct375@48 {
-		status = "okay";
+	temp-sensor@48 {
 		compatible = "ti,tmp75c";
 		reg = <0x48>;
 	};
 
-	nct375@49 {
-		status = "okay";
+	temp-sensor@49 {
 		compatible = "ti,tmp75c";
 		reg = <0x49>;
 	};
-- 
2.36.1

[PATCH v5 2/3] arm: mvebu: add support for Methode eDPU

[Robert Marko]

Methode eDPU is an Armada 3720 power board based on the Methode uDPU.

They feature the same CPU, RAM, and storage as well as the form factor.

However, eDPU only has one SFP slot plus a copper G.hn port which does not
work under U-boot.

In order to reduce duplication, split the uDPU DTS into a common one.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
Changes in v4:
* Remove CMD_PCI as PCI is disabled anyway

Changes in v3:
* Use DTS-es pending merge upstream
* Re-enable SCSI as the Armada 37xx BOOT_TARGET_DEVICES defines SCSI device
as one of the bootable ones.
We dont have space constraints, so just re-enable SCSI rather than making
one more config header

Changes in v2:
* Correct the PHY mode to 2500Base-X
* Add the DTB to Makefile
* Remove SCSI/SATA, PCI and E1000 from defconfig as they are not present
---
 arch/arm/dts/Makefile                     |   1 +
 arch/arm/dts/armada-3720-eDPU-u-boot.dtsi |  45 ++++++
 arch/arm/dts/armada-3720-eDPU.dts         |  14 ++
 arch/arm/dts/armada-3720-uDPU.dts         | 150 +-------------------
 arch/arm/dts/armada-3720-uDPU.dtsi        | 160 ++++++++++++++++++++++
 configs/eDPU_defconfig                    |  95 +++++++++++++
 6 files changed, 316 insertions(+), 149 deletions(-)
 create mode 100644 arch/arm/dts/armada-3720-eDPU-u-boot.dtsi
 create mode 100644 arch/arm/dts/armada-3720-eDPU.dts
 create mode 100644 arch/arm/dts/armada-3720-uDPU.dtsi
 create mode 100644 configs/eDPU_defconfig

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 83630af4f6..c484875585 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -236,6 +236,7 @@ dtb-$(CONFIG_ARCH_MVEBU) +=			\
 	armada-3720-db.dtb			\
 	armada-3720-espressobin.dtb		\
 	armada-3720-turris-mox.dtb		\
+	armada-3720-eDPU.dtb			\
 	armada-3720-uDPU.dtb			\
 	armada-375-db.dtb			\
 	armada-385-atl-x530.dtb			\
diff --git a/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi b/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi
new file mode 100644
index 0000000000..1b2648f64d
--- /dev/null
+++ b/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/ {
+	smbios {
+		compatible = "u-boot,sysinfo-smbios";
+
+		smbios {
+			system {
+				product = "eDPU";
+			};
+
+			baseboard {
+				product = "eDPU";
+			};
+
+			chassis {
+				product = "eDPU";
+			};
+		};
+	};
+};
+
+&spi0 {
+	u-boot,dm-pre-reloc;
+
+	spi-flash@0 {
+		u-boot,dm-pre-reloc;
+	};
+};
+
+&sdhci0 {
+	u-boot,dm-pre-reloc;
+};
+
+&eth0 {
+	/* G.hn does not work without additional configuration */
+	status = "disabled";
+};
+
+&eth1 {
+	fixed-link {
+		speed = <1000>;
+		full-duplex;
+	};
+};
diff --git a/arch/arm/dts/armada-3720-eDPU.dts b/arch/arm/dts/armada-3720-eDPU.dts
new file mode 100644
index 0000000000..57fc698e55
--- /dev/null
+++ b/arch/arm/dts/armada-3720-eDPU.dts
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+/dts-v1/;
+
+#include "armada-3720-uDPU.dtsi"
+
+/ {
+	model = "Methode eDPU Board";
+	compatible = "methode,edpu", "marvell,armada3720", "marvell,armada3710";
+};
+
+&eth0 {
+	phy-mode = "2500base-x";
+};
diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts
index f21a855fc6..a75734d88a 100644
--- a/arch/arm/dts/armada-3720-uDPU.dts
+++ b/arch/arm/dts/armada-3720-uDPU.dts
@@ -1,66 +1,13 @@
 // 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"
+#include "armada-3720-uDPU.dtsi"
 
 / {
 	model = "Methode uDPU Board";
 	compatible = "methode,udpu", "marvell,armada3720", "marvell,armada3710";
 
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	memory@0 {
-		device_type = "memory";
-		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
-	};
-
-	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_eth0: sfp-eth0 {
 		compatible = "sff,sfp";
 		i2c-bus = <&i2c0>;
@@ -70,55 +17,6 @@
 		tx-fault-gpio = <&gpiosb 5 GPIO_ACTIVE_HIGH>;
 		maximum-power-milliwatt = <3000>;
 	};
-
-	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 {
@@ -126,11 +24,6 @@
 		groups = "i2c1";
 		function = "gpio";
 	};
-
-	i2c2_recovery_pins: i2c2-recovery-pins {
-		groups = "i2c2";
-		function = "gpio";
-	};
 };
 
 &i2c0 {
@@ -143,48 +36,7 @@
 	sda-gpios = <&gpionb 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 };
 
-&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 {
 	phy-mode = "sgmii";
-	status = "okay";
-	managed = "in-band-status";
-	phys = <&comphy1 0>;
 	sfp = <&sfp_eth0>;
 };
-
-&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/arch/arm/dts/armada-3720-uDPU.dtsi b/arch/arm/dts/armada-3720-uDPU.dtsi
new file mode 100644
index 0000000000..3f79923376
--- /dev/null
+++ b/arch/arm/dts/armada-3720-uDPU.dtsi
@@ -0,0 +1,160 @@
+// 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>;
+	};
+
+	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/configs/eDPU_defconfig b/configs/eDPU_defconfig
new file mode 100644
index 0000000000..e2e593ad21
--- /dev/null
+++ b/configs/eDPU_defconfig
@@ -0,0 +1,95 @@
+CONFIG_ARM=y
+CONFIG_ARCH_CPU_INIT=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_TARGET_MVEBU_ARMADA_37XX=y
+CONFIG_MVEBU_EFUSE=y
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x180000
+CONFIG_ENV_SECT_SIZE=0x10000
+CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="armada-3720-eDPU"
+CONFIG_DEBUG_UART_BASE=0xd0012000
+CONFIG_SYS_LOAD_ADDR=0x6000000
+CONFIG_DEBUG_UART=y
+CONFIG_DISTRO_DEFAULTS=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_USE_PREBOOT=y
+# CONFIG_DISPLAY_CPUINFO is not set
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_ARCH_EARLY_INIT_R=y
+CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_SYS_PROMPT="eDPU>> "
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_FUSE=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_MTD=y
+# CONFIG_CMD_SCSI is not set
+CONFIG_CMD_SPI=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_TIME=y
+CONFIG_CMD_MVEBU_BUBT=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ENV_OVERWRITE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ARP_TIMEOUT=200
+CONFIG_NET_RETRY_COUNT=50
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_CLK=y
+CONFIG_CLK_MVEBU=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_GPIO=y
+CONFIG_SYS_I2C_MV=y
+CONFIG_MISC=y
+CONFIG_MMC_HS200_SUPPORT=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_MMC_SDHCI_XENON=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_SPI_FLASH_SFDP_SUPPORT=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_PHYLIB_10G=y
+CONFIG_PHY_MARVELL=y
+CONFIG_PHY_FIXED=y
+CONFIG_PHY_GIGE=y
+CONFIG_MVNETA=y
+CONFIG_MVMDIO=y
+CONFIG_PHY=y
+CONFIG_MVEBU_COMPHY_SUPPORT=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_ARMADA_37XX=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_SCSI=y
+CONFIG_MVEBU_A3700_UART=y
+CONFIG_MVEBU_A3700_SPI=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SMBIOS=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_MCS7830=y
+CONFIG_USB_ETHER_RTL8152=y
+CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_LZO=y
+CONFIG_SPL_LZO=y
-- 
2.36.1

[PATCH v5 3/3] MAINTAINERS: add myself as Methode maintainer

[Robert Marko]

I am currently maintaing the Methode uDPU and eDPU boards so add myself
as the maintainer for them.

Remove the old entry from board/Marvell/mvebu_armada-37xx/MAINTAINERS.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
Changes in v5:
* Remove entry from the board/Marvell/mvebu_armada-37xx/MAINTAINERS
---
 MAINTAINERS                                 | 8 ++++++++
 board/Marvell/mvebu_armada-37xx/MAINTAINERS | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 56be0bfad0..3d72b0c11f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -344,6 +344,14 @@ F:	tools/mtk_image.c
 F:	tools/mtk_image.h
 N:	mediatek
 
+ARM METHODE SUPPORT
+M:	Robert Marko <robert.marko@sartura.hr>
+S:	Maintained
+F:	arch/arm/dts/armada-3720-eDPU*
+F:	arch/arm/dts/armada-3720-uDPU*
+F:	configs/eDPU_defconfig
+F:	configs/uDPU_defconfig
+
 ARM MICROCHIP/ATMEL AT91
 M:	Eugen Hristev <eugen.hristev@microchip.com>
 S:	Maintained
diff --git a/board/Marvell/mvebu_armada-37xx/MAINTAINERS b/board/Marvell/mvebu_armada-37xx/MAINTAINERS
index f2c0a582d7..9b0afeef10 100644
--- a/board/Marvell/mvebu_armada-37xx/MAINTAINERS
+++ b/board/Marvell/mvebu_armada-37xx/MAINTAINERS
@@ -9,8 +9,3 @@ ESPRESSOBin BOARD
 M:	Konstantin Porotchkin <kostap@marvell.com>
 S:	Maintained
 F:	configs/mvebu_espressobin-88f3720_defconfig
-
-uDPU BOARD
-M:	Vladimir Vid <vladimir.vid@sartura.hr>
-S:	Maintained
-F:	configs/uDPU_defconfig
-- 
2.36.1

Re: [PATCH v5 1/3] arm: mvebu: dts: sync DTS

[Stefan Roese]

On 20.05.22 13:46, Robert Marko wrote:
> Update the uDPU DTS to the version that is pending upstream [1][2][3][4].
> 
> [1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-4-robert.marko@sartura.hr/
> [2] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-5-robert.marko@sartura.hr/
> [3] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-6-robert.marko@sartura.hr/
> [4] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-7-robert.marko@sartura.hr/
> 
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   arch/arm/dts/armada-3720-uDPU.dts | 23 ++++++++++-------------
>   1 file changed, 10 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts
> index 1f534c0c65..f21a855fc6 100644
> --- a/arch/arm/dts/armada-3720-uDPU.dts
> +++ b/arch/arm/dts/armada-3720-uDPU.dts
> @@ -16,7 +16,7 @@
>   
>   / {
>   	model = "Methode uDPU Board";
> -	compatible = "methode,udpu", "marvell,armada3720";
> +	compatible = "methode,udpu", "marvell,armada3720", "marvell,armada3710";
>   
>   	chosen {
>   		stdout-path = "serial0:115200n8";
> @@ -28,35 +28,34 @@
>   	};
>   
>   	leds {
> -		pinctrl-names = "default";
>   		compatible = "gpio-leds";
>   
> -		power1 {
> +		led-power1 {
>   			label = "udpu:green:power";
>   			gpios = <&gpionb 11 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		power2 {
> +		led-power2 {
>   			label = "udpu:red:power";
>   			gpios = <&gpionb 12 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		network1 {
> +		led-network1 {
>   			label = "udpu:green:network";
>   			gpios = <&gpionb 13 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		network2 {
> +		led-network2 {
>   			label = "udpu:red:network";
>   			gpios = <&gpionb 14 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		alarm1 {
> +		led-alarm1 {
>   			label = "udpu:green:alarm";
>   			gpios = <&gpionb 15 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		alarm2 {
> +		led-alarm2 {
>   			label = "udpu:red:alarm";
>   			gpios = <&gpionb 16 GPIO_ACTIVE_LOW>;
>   		};
> @@ -99,7 +98,7 @@
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&spi_quad_pins>;
>   
> -	spi-flash@0 {
> +	flash@0 {
>   		compatible = "jedec,spi-nor";
>   		reg = <0>;
>   		spi-max-frequency = <54000000>;
> @@ -153,14 +152,12 @@
>   	scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
>   	sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
>   
> -	nct375@48 {
> -		status = "okay";
> +	temp-sensor@48 {
>   		compatible = "ti,tmp75c";
>   		reg = <0x48>;
>   	};
>   
> -	nct375@49 {
> -		status = "okay";
> +	temp-sensor@49 {
>   		compatible = "ti,tmp75c";
>   		reg = <0x49>;
>   	};

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH v5 2/3] arm: mvebu: add support for Methode eDPU

[Stefan Roese]

On 20.05.22 13:46, Robert Marko wrote:
> Methode eDPU is an Armada 3720 power board based on the Methode uDPU.
> 
> They feature the same CPU, RAM, and storage as well as the form factor.
> 
> However, eDPU only has one SFP slot plus a copper G.hn port which does not
> work under U-boot.
> 
> In order to reduce duplication, split the uDPU DTS into a common one.
> 
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
> Changes in v4:
> * Remove CMD_PCI as PCI is disabled anyway
> 
> Changes in v3:
> * Use DTS-es pending merge upstream
> * Re-enable SCSI as the Armada 37xx BOOT_TARGET_DEVICES defines SCSI device
> as one of the bootable ones.
> We dont have space constraints, so just re-enable SCSI rather than making
> one more config header
> 
> Changes in v2:
> * Correct the PHY mode to 2500Base-X
> * Add the DTB to Makefile
> * Remove SCSI/SATA, PCI and E1000 from defconfig as they are not present
> ---
>   arch/arm/dts/Makefile                     |   1 +
>   arch/arm/dts/armada-3720-eDPU-u-boot.dtsi |  45 ++++++
>   arch/arm/dts/armada-3720-eDPU.dts         |  14 ++
>   arch/arm/dts/armada-3720-uDPU.dts         | 150 +-------------------
>   arch/arm/dts/armada-3720-uDPU.dtsi        | 160 ++++++++++++++++++++++
>   configs/eDPU_defconfig                    |  95 +++++++++++++
>   6 files changed, 316 insertions(+), 149 deletions(-)
>   create mode 100644 arch/arm/dts/armada-3720-eDPU-u-boot.dtsi
>   create mode 100644 arch/arm/dts/armada-3720-eDPU.dts
>   create mode 100644 arch/arm/dts/armada-3720-uDPU.dtsi
>   create mode 100644 configs/eDPU_defconfig
> 
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 83630af4f6..c484875585 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -236,6 +236,7 @@ dtb-$(CONFIG_ARCH_MVEBU) +=			\
>   	armada-3720-db.dtb			\
>   	armada-3720-espressobin.dtb		\
>   	armada-3720-turris-mox.dtb		\
> +	armada-3720-eDPU.dtb			\
>   	armada-3720-uDPU.dtb			\
>   	armada-375-db.dtb			\
>   	armada-385-atl-x530.dtb			\
> diff --git a/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi b/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi
> new file mode 100644
> index 0000000000..1b2648f64d
> --- /dev/null
> +++ b/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi
> @@ -0,0 +1,45 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +
> +/ {
> +	smbios {
> +		compatible = "u-boot,sysinfo-smbios";
> +
> +		smbios {
> +			system {
> +				product = "eDPU";
> +			};
> +
> +			baseboard {
> +				product = "eDPU";
> +			};
> +
> +			chassis {
> +				product = "eDPU";
> +			};
> +		};
> +	};
> +};
> +
> +&spi0 {
> +	u-boot,dm-pre-reloc;
> +
> +	spi-flash@0 {
> +		u-boot,dm-pre-reloc;
> +	};
> +};
> +
> +&sdhci0 {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +&eth0 {
> +	/* G.hn does not work without additional configuration */
> +	status = "disabled";
> +};
> +
> +&eth1 {
> +	fixed-link {
> +		speed = <1000>;
> +		full-duplex;
> +	};
> +};
> diff --git a/arch/arm/dts/armada-3720-eDPU.dts b/arch/arm/dts/armada-3720-eDPU.dts
> new file mode 100644
> index 0000000000..57fc698e55
> --- /dev/null
> +++ b/arch/arm/dts/armada-3720-eDPU.dts
> @@ -0,0 +1,14 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +
> +/dts-v1/;
> +
> +#include "armada-3720-uDPU.dtsi"
> +
> +/ {
> +	model = "Methode eDPU Board";
> +	compatible = "methode,edpu", "marvell,armada3720", "marvell,armada3710";
> +};
> +
> +&eth0 {
> +	phy-mode = "2500base-x";
> +};
> diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts
> index f21a855fc6..a75734d88a 100644
> --- a/arch/arm/dts/armada-3720-uDPU.dts
> +++ b/arch/arm/dts/armada-3720-uDPU.dts
> @@ -1,66 +1,13 @@
>   // 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"
> +#include "armada-3720-uDPU.dtsi"
>   
>   / {
>   	model = "Methode uDPU Board";
>   	compatible = "methode,udpu", "marvell,armada3720", "marvell,armada3710";
>   
> -	chosen {
> -		stdout-path = "serial0:115200n8";
> -	};
> -
> -	memory@0 {
> -		device_type = "memory";
> -		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
> -	};
> -
> -	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_eth0: sfp-eth0 {
>   		compatible = "sff,sfp";
>   		i2c-bus = <&i2c0>;
> @@ -70,55 +17,6 @@
>   		tx-fault-gpio = <&gpiosb 5 GPIO_ACTIVE_HIGH>;
>   		maximum-power-milliwatt = <3000>;
>   	};
> -
> -	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 {
> @@ -126,11 +24,6 @@
>   		groups = "i2c1";
>   		function = "gpio";
>   	};
> -
> -	i2c2_recovery_pins: i2c2-recovery-pins {
> -		groups = "i2c2";
> -		function = "gpio";
> -	};
>   };
>   
>   &i2c0 {
> @@ -143,48 +36,7 @@
>   	sda-gpios = <&gpionb 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
>   };
>   
> -&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 {
>   	phy-mode = "sgmii";
> -	status = "okay";
> -	managed = "in-band-status";
> -	phys = <&comphy1 0>;
>   	sfp = <&sfp_eth0>;
>   };
> -
> -&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/arch/arm/dts/armada-3720-uDPU.dtsi b/arch/arm/dts/armada-3720-uDPU.dtsi
> new file mode 100644
> index 0000000000..3f79923376
> --- /dev/null
> +++ b/arch/arm/dts/armada-3720-uDPU.dtsi
> @@ -0,0 +1,160 @@
> +// 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>;
> +	};
> +
> +	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/configs/eDPU_defconfig b/configs/eDPU_defconfig
> new file mode 100644
> index 0000000000..e2e593ad21
> --- /dev/null
> +++ b/configs/eDPU_defconfig
> @@ -0,0 +1,95 @@
> +CONFIG_ARM=y
> +CONFIG_ARCH_CPU_INIT=y
> +CONFIG_ARCH_MVEBU=y
> +CONFIG_SYS_TEXT_BASE=0x00000000
> +CONFIG_TARGET_MVEBU_ARMADA_37XX=y
> +CONFIG_MVEBU_EFUSE=y
> +CONFIG_ENV_SIZE=0x10000
> +CONFIG_ENV_OFFSET=0x180000
> +CONFIG_ENV_SECT_SIZE=0x10000
> +CONFIG_DM_GPIO=y
> +CONFIG_DEFAULT_DEVICE_TREE="armada-3720-eDPU"
> +CONFIG_DEBUG_UART_BASE=0xd0012000
> +CONFIG_SYS_LOAD_ADDR=0x6000000
> +CONFIG_DEBUG_UART=y
> +CONFIG_DISTRO_DEFAULTS=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_FIT=y
> +CONFIG_FIT_VERBOSE=y
> +CONFIG_USE_PREBOOT=y
> +# CONFIG_DISPLAY_CPUINFO is not set
> +# CONFIG_DISPLAY_BOARDINFO is not set
> +CONFIG_DISPLAY_BOARDINFO_LATE=y
> +CONFIG_ARCH_EARLY_INIT_R=y
> +CONFIG_BOARD_EARLY_INIT_F=y
> +CONFIG_SYS_PROMPT="eDPU>> "
> +# CONFIG_CMD_ELF is not set
> +# CONFIG_CMD_IMI is not set
> +# CONFIG_CMD_XIMG is not set
> +# CONFIG_CMD_FLASH is not set
> +CONFIG_CMD_FUSE=y
> +CONFIG_CMD_GPIO=y
> +CONFIG_CMD_I2C=y
> +CONFIG_CMD_MMC=y
> +CONFIG_CMD_MTD=y
> +# CONFIG_CMD_SCSI is not set
> +CONFIG_CMD_SPI=y
> +CONFIG_CMD_USB=y
> +# CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_TFTPPUT=y
> +CONFIG_CMD_CACHE=y
> +CONFIG_CMD_TIME=y
> +CONFIG_CMD_MVEBU_BUBT=y
> +CONFIG_CMD_EXT4_WRITE=y
> +CONFIG_MAC_PARTITION=y
> +CONFIG_ENV_OVERWRITE=y
> +CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_ARP_TIMEOUT=200
> +CONFIG_NET_RETRY_COUNT=50
> +CONFIG_NET_RANDOM_ETHADDR=y
> +CONFIG_CLK=y
> +CONFIG_CLK_MVEBU=y
> +CONFIG_DM_I2C=y
> +CONFIG_DM_I2C_GPIO=y
> +CONFIG_SYS_I2C_MV=y
> +CONFIG_MISC=y
> +CONFIG_MMC_HS200_SUPPORT=y
> +CONFIG_MMC_SDHCI=y
> +CONFIG_MMC_SDHCI_SDMA=y
> +CONFIG_MMC_SDHCI_XENON=y
> +CONFIG_MTD=y
> +CONFIG_DM_MTD=y
> +CONFIG_SPI_FLASH_SFDP_SUPPORT=y
> +CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_SPI_FLASH_SPANSION=y
> +CONFIG_SPI_FLASH_STMICRO=y
> +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
> +CONFIG_SPI_FLASH_MTD=y
> +CONFIG_PHYLIB_10G=y
> +CONFIG_PHY_MARVELL=y
> +CONFIG_PHY_FIXED=y
> +CONFIG_PHY_GIGE=y
> +CONFIG_MVNETA=y
> +CONFIG_MVMDIO=y
> +CONFIG_PHY=y
> +CONFIG_MVEBU_COMPHY_SUPPORT=y
> +CONFIG_PINCTRL=y
> +CONFIG_PINCTRL_ARMADA_37XX=y
> +CONFIG_DM_REGULATOR_FIXED=y
> +CONFIG_DM_REGULATOR_GPIO=y
> +CONFIG_DM_SCSI=y
> +CONFIG_MVEBU_A3700_UART=y
> +CONFIG_MVEBU_A3700_SPI=y
> +CONFIG_SYSINFO=y
> +CONFIG_SYSINFO_SMBIOS=y
> +CONFIG_USB=y
> +CONFIG_USB_XHCI_HCD=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_HOST_ETHER=y
> +CONFIG_USB_ETHER_ASIX=y
> +CONFIG_USB_ETHER_MCS7830=y
> +CONFIG_USB_ETHER_RTL8152=y
> +CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_LZO=y
> +CONFIG_SPL_LZO=y

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH v5 3/3] MAINTAINERS: add myself as Methode maintainer

[Stefan Roese]

On 20.05.22 13:46, Robert Marko wrote:
> I am currently maintaing the Methode uDPU and eDPU boards so add myself
> as the maintainer for them.
> 
> Remove the old entry from board/Marvell/mvebu_armada-37xx/MAINTAINERS.
> 
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
> Changes in v5:
> * Remove entry from the board/Marvell/mvebu_armada-37xx/MAINTAINERS
> ---
>   MAINTAINERS                                 | 8 ++++++++
>   board/Marvell/mvebu_armada-37xx/MAINTAINERS | 5 -----
>   2 files changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 56be0bfad0..3d72b0c11f 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -344,6 +344,14 @@ F:	tools/mtk_image.c
>   F:	tools/mtk_image.h
>   N:	mediatek
>   
> +ARM METHODE SUPPORT
> +M:	Robert Marko <robert.marko@sartura.hr>
> +S:	Maintained
> +F:	arch/arm/dts/armada-3720-eDPU*
> +F:	arch/arm/dts/armada-3720-uDPU*
> +F:	configs/eDPU_defconfig
> +F:	configs/uDPU_defconfig
> +
>   ARM MICROCHIP/ATMEL AT91
>   M:	Eugen Hristev <eugen.hristev@microchip.com>
>   S:	Maintained
> diff --git a/board/Marvell/mvebu_armada-37xx/MAINTAINERS b/board/Marvell/mvebu_armada-37xx/MAINTAINERS
> index f2c0a582d7..9b0afeef10 100644
> --- a/board/Marvell/mvebu_armada-37xx/MAINTAINERS
> +++ b/board/Marvell/mvebu_armada-37xx/MAINTAINERS
> @@ -9,8 +9,3 @@ ESPRESSOBin BOARD
>   M:	Konstantin Porotchkin <kostap@marvell.com>
>   S:	Maintained
>   F:	configs/mvebu_espressobin-88f3720_defconfig
> -
> -uDPU BOARD
> -M:	Vladimir Vid <vladimir.vid@sartura.hr>
> -S:	Maintained
> -F:	configs/uDPU_defconfig

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH v5 2/3] arm: mvebu: add support for Methode eDPU

[Pali Rohár]

On Friday 20 May 2022 13:46:32 Robert Marko wrote:
> Changes in v4:
> * Remove CMD_PCI as PCI is disabled anyway
> 
> Changes in v3:
> * Use DTS-es pending merge upstream
> * Re-enable SCSI as the Armada 37xx BOOT_TARGET_DEVICES defines SCSI device
> as one of the bootable ones.
> We dont have space constraints, so just re-enable SCSI rather than making
> one more config header

Hello! Is this SCSI error related to distroboot as for NVMe here?
https://patchwork.ozlabs.org/comment/2896154/

> Changes in v2:
> * Correct the PHY mode to 2500Base-X
> * Add the DTB to Makefile
> * Remove SCSI/SATA, PCI and E1000 from defconfig as they are not present

Re: [PATCH v5 2/3] arm: mvebu: add support for Methode eDPU

[Robert Marko]

On Mon, May 23, 2022 at 10:20 AM Pali Rohár <pali@kernel.org> wrote:
>
> On Friday 20 May 2022 13:46:32 Robert Marko wrote:
> > Changes in v4:
> > * Remove CMD_PCI as PCI is disabled anyway
> >
> > Changes in v3:
> > * Use DTS-es pending merge upstream
> > * Re-enable SCSI as the Armada 37xx BOOT_TARGET_DEVICES defines SCSI device
> > as one of the bootable ones.
> > We dont have space constraints, so just re-enable SCSI rather than making
> > one more config header
>
> Hello! Is this SCSI error related to distroboot as for NVMe here?
> https://patchwork.ozlabs.org/comment/2896154/

Hi Pali, its the same type of error, just for SCSI.
I see that you posted a possible solution for cases where boards dont have
one of the listed media enabled.

Regards,
Robert
>
> > Changes in v2:
> > * Correct the PHY mode to 2500Base-X
> > * Add the DTB to Makefile
> > * Remove SCSI/SATA, PCI and E1000 from defconfig as they are not present



-- 
Robert Marko
Staff Embedded Linux Engineer
Sartura Ltd.
Lendavska ulica 16a
10000 Zagreb, Croatia
Email: robert.marko@sartura.hr
Web: www.sartura.hr

Re: [PATCH v5 2/3] arm: mvebu: add support for Methode eDPU

[Pali Rohár]

On Monday 23 May 2022 11:18:23 Robert Marko wrote:
> On Mon, May 23, 2022 at 10:20 AM Pali Rohár <pali@kernel.org> wrote:
> >
> > On Friday 20 May 2022 13:46:32 Robert Marko wrote:
> > > Changes in v4:
> > > * Remove CMD_PCI as PCI is disabled anyway
> > >
> > > Changes in v3:
> > > * Use DTS-es pending merge upstream
> > > * Re-enable SCSI as the Armada 37xx BOOT_TARGET_DEVICES defines SCSI device
> > > as one of the bootable ones.
> > > We dont have space constraints, so just re-enable SCSI rather than making
> > > one more config header
> >
> > Hello! Is this SCSI error related to distroboot as for NVMe here?
> > https://patchwork.ozlabs.org/comment/2896154/
> 
> Hi Pali, its the same type of error, just for SCSI.
> I see that you posted a possible solution for cases where boards dont have
> one of the listed media enabled.

Ok! I added guard in new patch for all boot targets, including SCSI, so
it should fix also issue for *DPU boards.

> Regards,
> Robert
> >
> > > Changes in v2:
> > > * Correct the PHY mode to 2500Base-X
> > > * Add the DTB to Makefile
> > > * Remove SCSI/SATA, PCI and E1000 from defconfig as they are not present
> 
> 
> 
> -- 
> Robert Marko
> Staff Embedded Linux Engineer
> Sartura Ltd.
> Lendavska ulica 16a
> 10000 Zagreb, Croatia
> Email: robert.marko@sartura.hr
> Web: www.sartura.hr

Re: [PATCH v5 2/3] arm: mvebu: add support for Methode eDPU

[Pali Rohár]

On Monday 23 May 2022 11:20:27 Pali Rohár wrote:
> On Monday 23 May 2022 11:18:23 Robert Marko wrote:
> > On Mon, May 23, 2022 at 10:20 AM Pali Rohár <pali@kernel.org> wrote:
> > >
> > > On Friday 20 May 2022 13:46:32 Robert Marko wrote:
> > > > Changes in v4:
> > > > * Remove CMD_PCI as PCI is disabled anyway
> > > >
> > > > Changes in v3:
> > > > * Use DTS-es pending merge upstream
> > > > * Re-enable SCSI as the Armada 37xx BOOT_TARGET_DEVICES defines SCSI device
> > > > as one of the bootable ones.
> > > > We dont have space constraints, so just re-enable SCSI rather than making
> > > > one more config header
> > >
> > > Hello! Is this SCSI error related to distroboot as for NVMe here?
> > > https://patchwork.ozlabs.org/comment/2896154/
> > 
> > Hi Pali, its the same type of error, just for SCSI.
> > I see that you posted a possible solution for cases where boards dont have
> > one of the listed media enabled.
> 
> Ok! I added guard in new patch for all boot targets, including SCSI, so
> it should fix also issue for *DPU boards.

Hello! Patch "Set BOOT_TARGET_DEVICES list to enabled peripherals" is
now in u-boot-marvell tree, so you could send a patch which disables
those unused peripherals in eDPU defconfig file.
https://source.denx.de/u-boot/custodians/u-boot-marvell/-/commits/master/

> > Regards,
> > Robert
> > >
> > > > Changes in v2:
> > > > * Correct the PHY mode to 2500Base-X
> > > > * Add the DTB to Makefile
> > > > * Remove SCSI/SATA, PCI and E1000 from defconfig as they are not present
> > 
> > 
> > 
> > -- 
> > Robert Marko
> > Staff Embedded Linux Engineer
> > Sartura Ltd.
> > Lendavska ulica 16a
> > 10000 Zagreb, Croatia
> > Email: robert.marko@sartura.hr
> > Web: www.sartura.hr

Re: [PATCH v5 2/3] arm: mvebu: add support for Methode eDPU

[Stefan Roese]

On 02.06.22 23:58, Pali Rohár wrote:
> On Monday 23 May 2022 11:20:27 Pali Rohár wrote:
>> On Monday 23 May 2022 11:18:23 Robert Marko wrote:
>>> On Mon, May 23, 2022 at 10:20 AM Pali Rohár <pali@kernel.org> wrote:
>>>>
>>>> On Friday 20 May 2022 13:46:32 Robert Marko wrote:
>>>>> Changes in v4:
>>>>> * Remove CMD_PCI as PCI is disabled anyway
>>>>>
>>>>> Changes in v3:
>>>>> * Use DTS-es pending merge upstream
>>>>> * Re-enable SCSI as the Armada 37xx BOOT_TARGET_DEVICES defines SCSI device
>>>>> as one of the bootable ones.
>>>>> We dont have space constraints, so just re-enable SCSI rather than making
>>>>> one more config header
>>>>
>>>> Hello! Is this SCSI error related to distroboot as for NVMe here?
>>>> https://patchwork.ozlabs.org/comment/2896154/
>>>
>>> Hi Pali, its the same type of error, just for SCSI.
>>> I see that you posted a possible solution for cases where boards dont have
>>> one of the listed media enabled.
>>
>> Ok! I added guard in new patch for all boot targets, including SCSI, so
>> it should fix also issue for *DPU boards.
> 
> Hello! Patch "Set BOOT_TARGET_DEVICES list to enabled peripherals" is
> now in u-boot-marvell tree, so you could send a patch which disables
> those unused peripherals in eDPU defconfig file.
> https://source.denx.de/u-boot/custodians/u-boot-marvell/-/commits/master/

Just to clarify: I originally wanted to push those changes in "master"
upstream beginning of this week. But decided to defer this until the
next merge window open, as most of them are not bug fixes.

Still Pali's comment is correct. You could already work on a patch using
these groundwork patches as basis.

Thanks,
Stefan

>>> Regards,
>>> Robert
>>>>
>>>>> Changes in v2:
>>>>> * Correct the PHY mode to 2500Base-X
>>>>> * Add the DTB to Makefile
>>>>> * Remove SCSI/SATA, PCI and E1000 from defconfig as they are not present
>>>
>>>
>>>
>>> -- 
>>> Robert Marko
>>> Staff Embedded Linux Engineer
>>> Sartura Ltd.
>>> Lendavska ulica 16a
>>> 10000 Zagreb, Croatia
>>> Email: robert.marko@sartura.hr
>>> Web: www.sartura.hr

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH v5 2/3] arm: mvebu: add support for Methode eDPU

[Robert Marko]

On Fri, Jun 3, 2022 at 11:42 AM Stefan Roese <sr@denx.de> wrote:
>
> On 02.06.22 23:58, Pali Rohár wrote:
> > On Monday 23 May 2022 11:20:27 Pali Rohár wrote:
> >> On Monday 23 May 2022 11:18:23 Robert Marko wrote:
> >>> On Mon, May 23, 2022 at 10:20 AM Pali Rohár <pali@kernel.org> wrote:
> >>>>
> >>>> On Friday 20 May 2022 13:46:32 Robert Marko wrote:
> >>>>> Changes in v4:
> >>>>> * Remove CMD_PCI as PCI is disabled anyway
> >>>>>
> >>>>> Changes in v3:
> >>>>> * Use DTS-es pending merge upstream
> >>>>> * Re-enable SCSI as the Armada 37xx BOOT_TARGET_DEVICES defines SCSI device
> >>>>> as one of the bootable ones.
> >>>>> We dont have space constraints, so just re-enable SCSI rather than making
> >>>>> one more config header
> >>>>
> >>>> Hello! Is this SCSI error related to distroboot as for NVMe here?
> >>>> https://patchwork.ozlabs.org/comment/2896154/
> >>>
> >>> Hi Pali, its the same type of error, just for SCSI.
> >>> I see that you posted a possible solution for cases where boards dont have
> >>> one of the listed media enabled.
> >>
> >> Ok! I added guard in new patch for all boot targets, including SCSI, so
> >> it should fix also issue for *DPU boards.
> >
> > Hello! Patch "Set BOOT_TARGET_DEVICES list to enabled peripherals" is
> > now in u-boot-marvell tree, so you could send a patch which disables
> > those unused peripherals in eDPU defconfig file.
> > https://source.denx.de/u-boot/custodians/u-boot-marvell/-/commits/master/
>
> Just to clarify: I originally wanted to push those changes in "master"
> upstream beginning of this week. But decided to defer this until the
> next merge window open, as most of them are not bug fixes.
>
> Still Pali's comment is correct. You could already work on a patch using
> these groundwork patches as basis.

No issues, I was waiting for them to be picked into your tree.
I will whip up a patch to disable SCSI now that it's not required anymore.

Regards,
Robert
>
> Thanks,
> Stefan
>
> >>> Regards,
> >>> Robert
> >>>>
> >>>>> Changes in v2:
> >>>>> * Correct the PHY mode to 2500Base-X
> >>>>> * Add the DTB to Makefile
> >>>>> * Remove SCSI/SATA, PCI and E1000 from defconfig as they are not present
> >>>
> >>>
> >>>
> >>> --
> >>> Robert Marko
> >>> Staff Embedded Linux Engineer
> >>> Sartura Ltd.
> >>> Lendavska ulica 16a
> >>> 10000 Zagreb, Croatia
> >>> Email: robert.marko@sartura.hr
> >>> Web: www.sartura.hr
>
> Viele Grüße,
> Stefan Roese
>
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de



-- 
Robert Marko
Staff Embedded Linux Engineer
Sartura Ltd.
Lendavska ulica 16a
10000 Zagreb, Croatia
Email: robert.marko@sartura.hr
Web: www.sartura.hr

Re: [PATCH v5 1/3] arm: mvebu: dts: sync DTS

[Stefan Roese]

On 20.05.22 13:46, Robert Marko wrote:
> Update the uDPU DTS to the version that is pending upstream [1][2][3][4].
> 
> [1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-4-robert.marko@sartura.hr/
> [2] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-5-robert.marko@sartura.hr/
> [3] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-6-robert.marko@sartura.hr/
> [4] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220516124828.45144-7-robert.marko@sartura.hr/
> 
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   arch/arm/dts/armada-3720-uDPU.dts | 23 ++++++++++-------------
>   1 file changed, 10 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts
> index 1f534c0c65..f21a855fc6 100644
> --- a/arch/arm/dts/armada-3720-uDPU.dts
> +++ b/arch/arm/dts/armada-3720-uDPU.dts
> @@ -16,7 +16,7 @@
>   
>   / {
>   	model = "Methode uDPU Board";
> -	compatible = "methode,udpu", "marvell,armada3720";
> +	compatible = "methode,udpu", "marvell,armada3720", "marvell,armada3710";
>   
>   	chosen {
>   		stdout-path = "serial0:115200n8";
> @@ -28,35 +28,34 @@
>   	};
>   
>   	leds {
> -		pinctrl-names = "default";
>   		compatible = "gpio-leds";
>   
> -		power1 {
> +		led-power1 {
>   			label = "udpu:green:power";
>   			gpios = <&gpionb 11 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		power2 {
> +		led-power2 {
>   			label = "udpu:red:power";
>   			gpios = <&gpionb 12 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		network1 {
> +		led-network1 {
>   			label = "udpu:green:network";
>   			gpios = <&gpionb 13 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		network2 {
> +		led-network2 {
>   			label = "udpu:red:network";
>   			gpios = <&gpionb 14 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		alarm1 {
> +		led-alarm1 {
>   			label = "udpu:green:alarm";
>   			gpios = <&gpionb 15 GPIO_ACTIVE_LOW>;
>   		};
>   
> -		alarm2 {
> +		led-alarm2 {
>   			label = "udpu:red:alarm";
>   			gpios = <&gpionb 16 GPIO_ACTIVE_LOW>;
>   		};
> @@ -99,7 +98,7 @@
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&spi_quad_pins>;
>   
> -	spi-flash@0 {
> +	flash@0 {
>   		compatible = "jedec,spi-nor";
>   		reg = <0>;
>   		spi-max-frequency = <54000000>;
> @@ -153,14 +152,12 @@
>   	scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
>   	sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
>   
> -	nct375@48 {
> -		status = "okay";
> +	temp-sensor@48 {
>   		compatible = "ti,tmp75c";
>   		reg = <0x48>;
>   	};
>   
> -	nct375@49 {
> -		status = "okay";
> +	temp-sensor@49 {
>   		compatible = "ti,tmp75c";
>   		reg = <0x49>;
>   	};

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH v5 2/3] arm: mvebu: add support for Methode eDPU

[Stefan Roese]

On 20.05.22 13:46, Robert Marko wrote:
> Methode eDPU is an Armada 3720 power board based on the Methode uDPU.
> 
> They feature the same CPU, RAM, and storage as well as the form factor.
> 
> However, eDPU only has one SFP slot plus a copper G.hn port which does not
> work under U-boot.
> 
> In order to reduce duplication, split the uDPU DTS into a common one.
> 
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
> Changes in v4:
> * Remove CMD_PCI as PCI is disabled anyway
> 
> Changes in v3:
> * Use DTS-es pending merge upstream
> * Re-enable SCSI as the Armada 37xx BOOT_TARGET_DEVICES defines SCSI device
> as one of the bootable ones.
> We dont have space constraints, so just re-enable SCSI rather than making
> one more config header
> 
> Changes in v2:
> * Correct the PHY mode to 2500Base-X
> * Add the DTB to Makefile
> * Remove SCSI/SATA, PCI and E1000 from defconfig as they are not present
> ---
>   arch/arm/dts/Makefile                     |   1 +
>   arch/arm/dts/armada-3720-eDPU-u-boot.dtsi |  45 ++++++
>   arch/arm/dts/armada-3720-eDPU.dts         |  14 ++
>   arch/arm/dts/armada-3720-uDPU.dts         | 150 +-------------------
>   arch/arm/dts/armada-3720-uDPU.dtsi        | 160 ++++++++++++++++++++++
>   configs/eDPU_defconfig                    |  95 +++++++++++++
>   6 files changed, 316 insertions(+), 149 deletions(-)
>   create mode 100644 arch/arm/dts/armada-3720-eDPU-u-boot.dtsi
>   create mode 100644 arch/arm/dts/armada-3720-eDPU.dts
>   create mode 100644 arch/arm/dts/armada-3720-uDPU.dtsi
>   create mode 100644 configs/eDPU_defconfig
> 
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 83630af4f6..c484875585 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -236,6 +236,7 @@ dtb-$(CONFIG_ARCH_MVEBU) +=			\
>   	armada-3720-db.dtb			\
>   	armada-3720-espressobin.dtb		\
>   	armada-3720-turris-mox.dtb		\
> +	armada-3720-eDPU.dtb			\
>   	armada-3720-uDPU.dtb			\
>   	armada-375-db.dtb			\
>   	armada-385-atl-x530.dtb			\
> diff --git a/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi b/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi
> new file mode 100644
> index 0000000000..1b2648f64d
> --- /dev/null
> +++ b/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi
> @@ -0,0 +1,45 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +
> +/ {
> +	smbios {
> +		compatible = "u-boot,sysinfo-smbios";
> +
> +		smbios {
> +			system {
> +				product = "eDPU";
> +			};
> +
> +			baseboard {
> +				product = "eDPU";
> +			};
> +
> +			chassis {
> +				product = "eDPU";
> +			};
> +		};
> +	};
> +};
> +
> +&spi0 {
> +	u-boot,dm-pre-reloc;
> +
> +	spi-flash@0 {
> +		u-boot,dm-pre-reloc;
> +	};
> +};
> +
> +&sdhci0 {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +&eth0 {
> +	/* G.hn does not work without additional configuration */
> +	status = "disabled";
> +};
> +
> +&eth1 {
> +	fixed-link {
> +		speed = <1000>;
> +		full-duplex;
> +	};
> +};
> diff --git a/arch/arm/dts/armada-3720-eDPU.dts b/arch/arm/dts/armada-3720-eDPU.dts
> new file mode 100644
> index 0000000000..57fc698e55
> --- /dev/null
> +++ b/arch/arm/dts/armada-3720-eDPU.dts
> @@ -0,0 +1,14 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +
> +/dts-v1/;
> +
> +#include "armada-3720-uDPU.dtsi"
> +
> +/ {
> +	model = "Methode eDPU Board";
> +	compatible = "methode,edpu", "marvell,armada3720", "marvell,armada3710";
> +};
> +
> +&eth0 {
> +	phy-mode = "2500base-x";
> +};
> diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts
> index f21a855fc6..a75734d88a 100644
> --- a/arch/arm/dts/armada-3720-uDPU.dts
> +++ b/arch/arm/dts/armada-3720-uDPU.dts
> @@ -1,66 +1,13 @@
>   // 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"
> +#include "armada-3720-uDPU.dtsi"
>   
>   / {
>   	model = "Methode uDPU Board";
>   	compatible = "methode,udpu", "marvell,armada3720", "marvell,armada3710";
>   
> -	chosen {
> -		stdout-path = "serial0:115200n8";
> -	};
> -
> -	memory@0 {
> -		device_type = "memory";
> -		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
> -	};
> -
> -	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_eth0: sfp-eth0 {
>   		compatible = "sff,sfp";
>   		i2c-bus = <&i2c0>;
> @@ -70,55 +17,6 @@
>   		tx-fault-gpio = <&gpiosb 5 GPIO_ACTIVE_HIGH>;
>   		maximum-power-milliwatt = <3000>;
>   	};
> -
> -	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 {
> @@ -126,11 +24,6 @@
>   		groups = "i2c1";
>   		function = "gpio";
>   	};
> -
> -	i2c2_recovery_pins: i2c2-recovery-pins {
> -		groups = "i2c2";
> -		function = "gpio";
> -	};
>   };
>   
>   &i2c0 {
> @@ -143,48 +36,7 @@
>   	sda-gpios = <&gpionb 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
>   };
>   
> -&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 {
>   	phy-mode = "sgmii";
> -	status = "okay";
> -	managed = "in-band-status";
> -	phys = <&comphy1 0>;
>   	sfp = <&sfp_eth0>;
>   };
> -
> -&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/arch/arm/dts/armada-3720-uDPU.dtsi b/arch/arm/dts/armada-3720-uDPU.dtsi
> new file mode 100644
> index 0000000000..3f79923376
> --- /dev/null
> +++ b/arch/arm/dts/armada-3720-uDPU.dtsi
> @@ -0,0 +1,160 @@
> +// 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>;
> +	};
> +
> +	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/configs/eDPU_defconfig b/configs/eDPU_defconfig
> new file mode 100644
> index 0000000000..e2e593ad21
> --- /dev/null
> +++ b/configs/eDPU_defconfig
> @@ -0,0 +1,95 @@
> +CONFIG_ARM=y
> +CONFIG_ARCH_CPU_INIT=y
> +CONFIG_ARCH_MVEBU=y
> +CONFIG_SYS_TEXT_BASE=0x00000000
> +CONFIG_TARGET_MVEBU_ARMADA_37XX=y
> +CONFIG_MVEBU_EFUSE=y
> +CONFIG_ENV_SIZE=0x10000
> +CONFIG_ENV_OFFSET=0x180000
> +CONFIG_ENV_SECT_SIZE=0x10000
> +CONFIG_DM_GPIO=y
> +CONFIG_DEFAULT_DEVICE_TREE="armada-3720-eDPU"
> +CONFIG_DEBUG_UART_BASE=0xd0012000
> +CONFIG_SYS_LOAD_ADDR=0x6000000
> +CONFIG_DEBUG_UART=y
> +CONFIG_DISTRO_DEFAULTS=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_FIT=y
> +CONFIG_FIT_VERBOSE=y
> +CONFIG_USE_PREBOOT=y
> +# CONFIG_DISPLAY_CPUINFO is not set
> +# CONFIG_DISPLAY_BOARDINFO is not set
> +CONFIG_DISPLAY_BOARDINFO_LATE=y
> +CONFIG_ARCH_EARLY_INIT_R=y
> +CONFIG_BOARD_EARLY_INIT_F=y
> +CONFIG_SYS_PROMPT="eDPU>> "
> +# CONFIG_CMD_ELF is not set
> +# CONFIG_CMD_IMI is not set
> +# CONFIG_CMD_XIMG is not set
> +# CONFIG_CMD_FLASH is not set
> +CONFIG_CMD_FUSE=y
> +CONFIG_CMD_GPIO=y
> +CONFIG_CMD_I2C=y
> +CONFIG_CMD_MMC=y
> +CONFIG_CMD_MTD=y
> +# CONFIG_CMD_SCSI is not set
> +CONFIG_CMD_SPI=y
> +CONFIG_CMD_USB=y
> +# CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_TFTPPUT=y
> +CONFIG_CMD_CACHE=y
> +CONFIG_CMD_TIME=y
> +CONFIG_CMD_MVEBU_BUBT=y
> +CONFIG_CMD_EXT4_WRITE=y
> +CONFIG_MAC_PARTITION=y
> +CONFIG_ENV_OVERWRITE=y
> +CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_ARP_TIMEOUT=200
> +CONFIG_NET_RETRY_COUNT=50
> +CONFIG_NET_RANDOM_ETHADDR=y
> +CONFIG_CLK=y
> +CONFIG_CLK_MVEBU=y
> +CONFIG_DM_I2C=y
> +CONFIG_DM_I2C_GPIO=y
> +CONFIG_SYS_I2C_MV=y
> +CONFIG_MISC=y
> +CONFIG_MMC_HS200_SUPPORT=y
> +CONFIG_MMC_SDHCI=y
> +CONFIG_MMC_SDHCI_SDMA=y
> +CONFIG_MMC_SDHCI_XENON=y
> +CONFIG_MTD=y
> +CONFIG_DM_MTD=y
> +CONFIG_SPI_FLASH_SFDP_SUPPORT=y
> +CONFIG_SPI_FLASH_MACRONIX=y
> +CONFIG_SPI_FLASH_SPANSION=y
> +CONFIG_SPI_FLASH_STMICRO=y
> +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
> +CONFIG_SPI_FLASH_MTD=y
> +CONFIG_PHYLIB_10G=y
> +CONFIG_PHY_MARVELL=y
> +CONFIG_PHY_FIXED=y
> +CONFIG_PHY_GIGE=y
> +CONFIG_MVNETA=y
> +CONFIG_MVMDIO=y
> +CONFIG_PHY=y
> +CONFIG_MVEBU_COMPHY_SUPPORT=y
> +CONFIG_PINCTRL=y
> +CONFIG_PINCTRL_ARMADA_37XX=y
> +CONFIG_DM_REGULATOR_FIXED=y
> +CONFIG_DM_REGULATOR_GPIO=y
> +CONFIG_DM_SCSI=y
> +CONFIG_MVEBU_A3700_UART=y
> +CONFIG_MVEBU_A3700_SPI=y
> +CONFIG_SYSINFO=y
> +CONFIG_SYSINFO_SMBIOS=y
> +CONFIG_USB=y
> +CONFIG_USB_XHCI_HCD=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_HOST_ETHER=y
> +CONFIG_USB_ETHER_ASIX=y
> +CONFIG_USB_ETHER_MCS7830=y
> +CONFIG_USB_ETHER_RTL8152=y
> +CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_LZO=y
> +CONFIG_SPL_LZO=y

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH v5 3/3] MAINTAINERS: add myself as Methode maintainer

[Stefan Roese]

On 20.05.22 13:46, Robert Marko wrote:
> I am currently maintaing the Methode uDPU and eDPU boards so add myself
> as the maintainer for them.
> 
> Remove the old entry from board/Marvell/mvebu_armada-37xx/MAINTAINERS.
> 
> Signed-off-by: Robert Marko <robert.marko@sartura.hr>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
> Changes in v5:
> * Remove entry from the board/Marvell/mvebu_armada-37xx/MAINTAINERS
> ---
>   MAINTAINERS                                 | 8 ++++++++
>   board/Marvell/mvebu_armada-37xx/MAINTAINERS | 5 -----
>   2 files changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 56be0bfad0..3d72b0c11f 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -344,6 +344,14 @@ F:	tools/mtk_image.c
>   F:	tools/mtk_image.h
>   N:	mediatek
>   
> +ARM METHODE SUPPORT
> +M:	Robert Marko <robert.marko@sartura.hr>
> +S:	Maintained
> +F:	arch/arm/dts/armada-3720-eDPU*
> +F:	arch/arm/dts/armada-3720-uDPU*
> +F:	configs/eDPU_defconfig
> +F:	configs/uDPU_defconfig
> +
>   ARM MICROCHIP/ATMEL AT91
>   M:	Eugen Hristev <eugen.hristev@microchip.com>
>   S:	Maintained
> diff --git a/board/Marvell/mvebu_armada-37xx/MAINTAINERS b/board/Marvell/mvebu_armada-37xx/MAINTAINERS
> index f2c0a582d7..9b0afeef10 100644
> --- a/board/Marvell/mvebu_armada-37xx/MAINTAINERS
> +++ b/board/Marvell/mvebu_armada-37xx/MAINTAINERS
> @@ -9,8 +9,3 @@ ESPRESSOBin BOARD
>   M:	Konstantin Porotchkin <kostap@marvell.com>
>   S:	Maintained
>   F:	configs/mvebu_espressobin-88f3720_defconfig
> -
> -uDPU BOARD
> -M:	Vladimir Vid <vladimir.vid@sartura.hr>
> -S:	Maintained
> -F:	configs/uDPU_defconfig

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de