From: Fabio Estevam <festevam@gmail.com>
To: sbabic@denx.de
Cc: u-boot@lists.denx.de, Fabio Estevam <festevam@denx.de>
Subject: [PATCH v2 2/2] pico-pi-imx6ul: Convert to watchdog driver model
Date: Sat, 4 Nov 2023 18:52:42 -0300 [thread overview]
Message-ID: <20231104215242.310349-2-festevam@gmail.com> (raw)
In-Reply-To: <20231104215242.310349-1-festevam@gmail.com>
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
prev parent reply other threads:[~2023-11-04 21:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-04 21:52 [PATCH v2 1/2] pico-pi-imx6ul: Connvert to DM_SERIAL Fabio Estevam
2023-11-04 21:52 ` Fabio Estevam [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231104215242.310349-2-festevam@gmail.com \
--to=festevam@gmail.com \
--cc=festevam@denx.de \
--cc=sbabic@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox