* [PATCH 2/3] mx7dsabresd: Convert to watchdog driver model
2023-08-08 21:40 [PATCH 1/3] imx7d-sdb-u-boot: Pass SPDX-License tag Fabio Estevam
@ 2023-08-08 21:40 ` Fabio Estevam
2023-08-08 21:46 ` Marek Vasut
2023-10-16 16:46 ` sbabic
2023-08-08 21:40 ` [PATCH 3/3] smegw01: " Fabio Estevam
` (2 subsequent siblings)
3 siblings, 2 replies; 9+ messages in thread
From: Fabio Estevam @ 2023-08-08 21:40 UTC (permalink / raw)
To: sbabic; +Cc: uboot-imx, u-boot, marex, 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>
---
arch/arm/dts/imx7d-sdb-u-boot.dtsi | 12 ++++++++++++
configs/mx7dsabresd_defconfig | 3 +++
2 files changed, 15 insertions(+)
diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
index 818528c418f5..2e234b6b5828 100644
--- a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
@@ -1,5 +1,13 @@
// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/ {
+ wdt-reboot {
+ compatible = "wdt-reboot";
+ wdt = <&wdog1>;
+ bootph-pre-ram;
+ };
+};
+
&fec2 {
status = "disable";
};
@@ -58,3 +66,7 @@
>;
};
};
+
+&wdog1 {
+ bootph-pre-ram;
+};
diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
index 26e68d30d267..1c8105f44f28 100644
--- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@ -73,6 +73,8 @@ CONFIG_MXC_UART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_SOFT_SPI=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
CONFIG_IMX_THERMAL=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
@@ -85,4 +87,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_IMX_WATCHDOG=y
CONFIG_ERRNO_STR=y
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/3] mx7dsabresd: Convert to watchdog driver model
2023-08-08 21:40 ` [PATCH 2/3] mx7dsabresd: Convert to watchdog driver model Fabio Estevam
@ 2023-08-08 21:46 ` Marek Vasut
2023-10-16 16:46 ` sbabic
1 sibling, 0 replies; 9+ messages in thread
From: Marek Vasut @ 2023-08-08 21:46 UTC (permalink / raw)
To: Fabio Estevam, sbabic; +Cc: uboot-imx, u-boot, Fabio Estevam
On 8/8/23 23:40, 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>
Awesome
Reviewed-by: Marek Vasut <marex@denx.de>
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 2/3] mx7dsabresd: Convert to watchdog driver model
2023-08-08 21:40 ` [PATCH 2/3] mx7dsabresd: Convert to watchdog driver model Fabio Estevam
2023-08-08 21:46 ` Marek Vasut
@ 2023-10-16 16:46 ` sbabic
1 sibling, 0 replies; 9+ messages in thread
From: sbabic @ 2023-10-16 16:46 UTC (permalink / raw)
To: Fabio Estevam, u-boot
> 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>
> Reviewed-by: Marek Vasut <marex@denx.de>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] smegw01: Convert to watchdog driver model
2023-08-08 21:40 [PATCH 1/3] imx7d-sdb-u-boot: Pass SPDX-License tag Fabio Estevam
2023-08-08 21:40 ` [PATCH 2/3] mx7dsabresd: Convert to watchdog driver model Fabio Estevam
@ 2023-08-08 21:40 ` Fabio Estevam
2023-08-08 21:46 ` Marek Vasut
2023-10-16 16:46 ` sbabic
2023-08-08 21:46 ` [PATCH 1/3] imx7d-sdb-u-boot: Pass SPDX-License tag Marek Vasut
2023-10-16 16:45 ` sbabic
3 siblings, 2 replies; 9+ messages in thread
From: Fabio Estevam @ 2023-08-08 21:40 UTC (permalink / raw)
To: sbabic; +Cc: uboot-imx, u-boot, marex, 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>
---
arch/arm/dts/imx7d-smegw01-u-boot.dtsi | 13 +++++++++++++
configs/smegw01_defconfig | 3 +++
2 files changed, 16 insertions(+)
create mode 100644 arch/arm/dts/imx7d-smegw01-u-boot.dtsi
diff --git a/arch/arm/dts/imx7d-smegw01-u-boot.dtsi b/arch/arm/dts/imx7d-smegw01-u-boot.dtsi
new file mode 100644
index 000000000000..cf7ba3a95817
--- /dev/null
+++ b/arch/arm/dts/imx7d-smegw01-u-boot.dtsi
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+/ {
+ wdt-reboot {
+ compatible = "wdt-reboot";
+ wdt = <&wdog1>;
+ bootph-pre-ram;
+ };
+};
+
+&wdog1 {
+ bootph-pre-ram;
+};
diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig
index 7f1b2bee8e16..a3d289eeca1a 100644
--- a/configs/smegw01_defconfig
+++ b/configs/smegw01_defconfig
@@ -80,5 +80,8 @@ CONFIG_DM_REGULATOR_GPIO=y
CONFIG_SPECIFY_CONSOLE_INDEX=y
CONFIG_DM_SERIAL=y
CONFIG_MXC_UART=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
CONFIG_IMX_THERMAL=y
+CONFIG_IMX_WATCHDOG=y
# CONFIG_CMD_BOOTEFI_BOOTMGR is not set
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 3/3] smegw01: Convert to watchdog driver model
2023-08-08 21:40 ` [PATCH 3/3] smegw01: " Fabio Estevam
@ 2023-08-08 21:46 ` Marek Vasut
2023-10-16 16:46 ` sbabic
1 sibling, 0 replies; 9+ messages in thread
From: Marek Vasut @ 2023-08-08 21:46 UTC (permalink / raw)
To: Fabio Estevam, sbabic; +Cc: uboot-imx, u-boot, Fabio Estevam
On 8/8/23 23:40, 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>
Reviewed-by: Marek Vasut <marex@denx.de>
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 3/3] smegw01: Convert to watchdog driver model
2023-08-08 21:40 ` [PATCH 3/3] smegw01: " Fabio Estevam
2023-08-08 21:46 ` Marek Vasut
@ 2023-10-16 16:46 ` sbabic
1 sibling, 0 replies; 9+ messages in thread
From: sbabic @ 2023-10-16 16:46 UTC (permalink / raw)
To: Fabio Estevam, u-boot
> 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>
> Reviewed-by: Marek Vasut <marex@denx.de>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] imx7d-sdb-u-boot: Pass SPDX-License tag
2023-08-08 21:40 [PATCH 1/3] imx7d-sdb-u-boot: Pass SPDX-License tag Fabio Estevam
2023-08-08 21:40 ` [PATCH 2/3] mx7dsabresd: Convert to watchdog driver model Fabio Estevam
2023-08-08 21:40 ` [PATCH 3/3] smegw01: " Fabio Estevam
@ 2023-08-08 21:46 ` Marek Vasut
2023-10-16 16:45 ` sbabic
3 siblings, 0 replies; 9+ messages in thread
From: Marek Vasut @ 2023-08-08 21:46 UTC (permalink / raw)
To: Fabio Estevam, sbabic; +Cc: uboot-imx, u-boot, Fabio Estevam
On 8/8/23 23:40, Fabio Estevam wrote:
> From: Fabio Estevam <festevam@denx.de>
>
> SPDX-License tag is missing and checkpatch complains about it.
>
> Add the SPDX-License tag using the same one from imx7d-sdb.dts.
>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
> arch/arm/dts/imx7d-sdb-u-boot.dtsi | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
> index ac1d6e2e6480..818528c418f5 100644
> --- a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
> +++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
> @@ -1,3 +1,5 @@
> +// SPDX-License-Identifier: GPL-2.0+ OR MIT
> +
> &fec2 {
> status = "disable";
> };
Reviewed-by: Marek Vasut <marex@denx.de>
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/3] imx7d-sdb-u-boot: Pass SPDX-License tag
2023-08-08 21:40 [PATCH 1/3] imx7d-sdb-u-boot: Pass SPDX-License tag Fabio Estevam
` (2 preceding siblings ...)
2023-08-08 21:46 ` [PATCH 1/3] imx7d-sdb-u-boot: Pass SPDX-License tag Marek Vasut
@ 2023-10-16 16:45 ` sbabic
3 siblings, 0 replies; 9+ messages in thread
From: sbabic @ 2023-10-16 16:45 UTC (permalink / raw)
To: Fabio Estevam, u-boot
> From: Fabio Estevam <festevam@denx.de>
> SPDX-License tag is missing and checkpatch complains about it.
> Add the SPDX-License tag using the same one from imx7d-sdb.dts.
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> Reviewed-by: Marek Vasut <marex@denx.de>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 9+ messages in thread