diff mbox series

[v2,2/3] mx6sabresd: Convert to watchdog driver model

Message ID 20240202160405.4126192-2-festevam@gmail.com
State Accepted
Commit dbc4814515d37a3d1c4bb237f4e1c16d1f9e3736
Delegated to: Fabio Estevam
Headers show
Series [v2,1/3] mx6sabresd: Fix U-Boot corruption after saving the environment | expand

Commit Message

Fabio Estevam Feb. 2, 2024, 4:04 p.m. UTC 
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:
- None.

 arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi | 9 +++++++++
 configs/mx6sabresd_defconfig             | 3 +++
 2 files changed, 12 insertions(+)

Comments

Tom Rini Feb. 2, 2024, 4:07 p.m. UTC | #1 
On Fri, Feb 02, 2024 at 01:04:04PM -0300, Fabio Estevam wrote:

> 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:
> - None.
> 
>  arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi | 9 +++++++++
>  configs/mx6sabresd_defconfig             | 3 +++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi b/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi
> index 5c4101b76da2..9e9c4422f00e 100644
> --- a/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi
> +++ b/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi
> @@ -9,6 +9,11 @@
>  	aliases {
>  		mmc1 = &usdhc3;
>  	};
> +	wdt-reboot {
> +		compatible = "wdt-reboot";
> +		wdt = <&wdog2>;
> +		bootph-pre-ram;
> +	};
>  };
>  
>  &usdhc3 {
> @@ -18,3 +23,7 @@
>  &pinctrl_usdhc3 {
>  	bootph-pre-ram;
>  };
> +
> +&wdog2 {
> +	bootph-pre-ram;
> +};

Can all of this be upstreamed as well?
Fabio Estevam Feb. 2, 2024, 4:17 p.m. UTC | #2 
On Fri, Feb 2, 2024 at 1:07 PM Tom Rini <trini@konsulko.com> wrote:

> Can all of this be upstreamed as well?

I can try it, but that would go into kernel 6.9 in the best case.

For now, let's keep it in u-boot.dtsi.
Tom Rini Feb. 2, 2024, 5:15 p.m. UTC | #3 
On Fri, Feb 02, 2024 at 01:17:06PM -0300, Fabio Estevam wrote:
> On Fri, Feb 2, 2024 at 1:07 PM Tom Rini <trini@konsulko.com> wrote:
> 
> > Can all of this be upstreamed as well?
> 
> I can try it, but that would go into kernel 6.9 in the best case.
> 
> For now, let's keep it in u-boot.dtsi.

Yes, sorry, I'm not saying don't do this here, but can you please submit
it so that long term this can be converted to OF_UPSTREAM and also not
have a -u-boot.dtsi potentially.
diff mbox series

Patch

diff --git a/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi b/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi
index 5c4101b76da2..9e9c4422f00e 100644
--- a/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi
@@ -9,6 +9,11 @@ 
 	aliases {
 		mmc1 = &usdhc3;
 	};
+	wdt-reboot {
+		compatible = "wdt-reboot";
+		wdt = <&wdog2>;
+		bootph-pre-ram;
+	};
 };
 
 &usdhc3 {
@@ -18,3 +23,7 @@ 
 &pinctrl_usdhc3 {
 	bootph-pre-ram;
 };
+
+&wdog2 {
+	bootph-pre-ram;
+};
diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
index f19df607e7ae..69685f12eb10 100644
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@ -103,6 +103,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_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_MXC_SPI=y
@@ -129,3 +131,4 @@  CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
+CONFIG_IMX_WATCHDOG=y