Skip to contentSkip to conversation

tqma6q_mba6: Convert to watchdog driver model

PATCH Applied Fabio Estevam 1 participant 2 messages Aug 9, 2024 – Aug 13, 2024

Subsystems (2)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 tqma6q_mba6: Convert to watchdog driver model

From: Fabio Estevam <[email protected]>

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.

---
 arch/arm/dts/imx6dl-mba6b-u-boot.dtsi |  3 +++
 arch/arm/dts/imx6q-mba6b-u-boot.dtsi  |  3 +++
 arch/arm/dts/imx6qdl-mba6-u-boot.dtsi | 15 +++++++++++++++
 configs/tqma6dl_mba6_mmc_defconfig    |  3 +++
 configs/tqma6dl_mba6_spi_defconfig    |  3 +++
 configs/tqma6q_mba6_mmc_defconfig     |  3 +++
 configs/tqma6q_mba6_spi_defconfig     |  3 +++
 configs/tqma6s_mba6_mmc_defconfig     |  3 +++
 configs/tqma6s_mba6_spi_defconfig     |  3 +++
 9 files changed, 39 insertions(+)
 create mode 100644 arch/arm/dts/imx6dl-mba6b-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6q-mba6b-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6qdl-mba6-u-boot.dtsi
arch/arm/dts/imx6dl-mba6b-u-boot.dtsi new file +3 -0
new file mode 100644
index 000000000000..bb17ba9b4249
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "imx6qdl-mba6-u-boot.dtsi"
arch/arm/dts/imx6q-mba6b-u-boot.dtsi new file +3 -0
new file mode 100644
index 000000000000..bb17ba9b4249
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "imx6qdl-mba6-u-boot.dtsi"
arch/arm/dts/imx6qdl-mba6-u-boot.dtsi new file +15 -0
new file mode 100644
index 000000000000..78457ef68f4f
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "imx6qdl-u-boot.dtsi"
+
+/ {
+	wdt-reboot {
+		compatible = "wdt-reboot";
+		wdt = <&wdog1>;
+		bootph-pre-ram;
+	};
+};
+
+&wdog1 {
+	bootph-pre-ram;
+};
configs/tqma6dl_mba6_mmc_defconfig +3 -0
index 1a1d253c50ee..1534a2e9262a 100644
@@ -65,5 +65,8 @@ CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_SERIAL=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_DM_THERMAL=y
 CONFIG_IMX_THERMAL=y
+CONFIG_IMX_WATCHDOG=y
configs/tqma6dl_mba6_spi_defconfig +3 -0
index c6a1c7cf3d7d..5eaa9eb270ce 100644
@@ -69,5 +69,8 @@ CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_SERIAL=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_DM_THERMAL=y
 CONFIG_IMX_THERMAL=y
+CONFIG_IMX_WATCHDOG=y
configs/tqma6q_mba6_mmc_defconfig +3 -0
index 27f949c6ef68..3fcc1f8d54e1 100644
@@ -65,5 +65,8 @@ CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_SERIAL=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_DM_THERMAL=y
 CONFIG_IMX_THERMAL=y
+CONFIG_IMX_WATCHDOG=y
configs/tqma6q_mba6_spi_defconfig +3 -0
index 5d3ce79c35d9..a7ffc9edb5b4 100644
@@ -69,5 +69,8 @@ CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_SERIAL=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_DM_THERMAL=y
 CONFIG_IMX_THERMAL=y
+CONFIG_IMX_WATCHDOG=y
configs/tqma6s_mba6_mmc_defconfig +3 -0
index a9ed0d3fc2c6..7839c4858478 100644
@@ -65,5 +65,8 @@ CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_SERIAL=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_DM_THERMAL=y
 CONFIG_IMX_THERMAL=y
+CONFIG_IMX_WATCHDOG=y
configs/tqma6s_mba6_spi_defconfig +3 -0
index 9cd8c3dd20f4..c3bb44025b34 100644
@@ -69,5 +69,8 @@ CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_SERIAL=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_DM_THERMAL=y
 CONFIG_IMX_THERMAL=y
+CONFIG_IMX_WATCHDOG=y
Signature · 1 line
2.34.1
author reviewer Applied
#1 lore raw
Quoted 10 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

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.

Applied, thanks.