[PATCH v2 1/2] pico-pi-imx6ul: Connvert to DM_SERIAL

[PATCH v2 1/2] pico-pi-imx6ul: Connvert to DM_SERIAL

[Fabio Estevam]

From: Fabio Estevam <festevam@denx.de>

The conversion to DM_SERIAL is mandatory, so select this option.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
Changes since v1:
- None

 configs/pico-pi-imx6ul_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/pico-pi-imx6ul_defconfig b/configs/pico-pi-imx6ul_defconfig
index 1eee1e6c2ff5..3af968d55128 100644
--- a/configs/pico-pi-imx6ul_defconfig
+++ b/configs/pico-pi-imx6ul_defconfig
@@ -70,6 +70,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_USB=y
 CONFIG_SPL_USB_HOST=y
-- 
2.34.1

[PATCH v2 2/2] pico-pi-imx6ul: Convert to watchdog driver model

[Fabio Estevam]

From: Fabio Estevam <festevam@denx.de>

Commit 68dcbdd594d4 ("ARM: imx: Add weak default reset_cpu()") caused
the 'reset' command in U-Boot to not cause a board reset.
    
Fix it by switching to the watchdog driver model via sysreset, which
is the preferred method for implementing the watchdog reset.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
Changes since v1:
- Also added imx6ul-pico-pi-u-boot.dtsi which I forgot to add in v1.

 arch/arm/dts/imx6ul-pico-pi-u-boot.dtsi | 15 +++++++++++++++
 configs/pico-pi-imx6ul_defconfig        |  3 +++
 2 files changed, 18 insertions(+)
 create mode 100644 arch/arm/dts/imx6ul-pico-pi-u-boot.dtsi

diff --git a/arch/arm/dts/imx6ul-pico-pi-u-boot.dtsi b/arch/arm/dts/imx6ul-pico-pi-u-boot.dtsi
new file mode 100644
index 000000000000..95bd9c905954
--- /dev/null
+++ b/arch/arm/dts/imx6ul-pico-pi-u-boot.dtsi
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include "imx7s-u-boot.dtsi"
+
+/ {
+	wdt-reboot {
+		compatible = "wdt-reboot";
+		wdt = <&wdog1>;
+		bootph-pre-ram;
+	};
+};
+
+&wdog1 {
+	bootph-pre-ram;
+};
diff --git a/configs/pico-pi-imx6ul_defconfig b/configs/pico-pi-imx6ul_defconfig
index 3af968d55128..604a213e1ea4 100644
--- a/configs/pico-pi-imx6ul_defconfig
+++ b/configs/pico-pi-imx6ul_defconfig
@@ -72,6 +72,8 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_USB=y
 CONFIG_SPL_USB_HOST=y
 CONFIG_USB_MAX_CONTROLLER_COUNT=2
@@ -82,3 +84,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_IMX_WATCHDOG=y
-- 
2.34.1