From: Fabio Estevam <feste...@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 <feste...@denx.de>
---
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
diff --git a/arch/arm/dts/imx6dl-mba6b-u-boot.dtsi
b/arch/arm/dts/imx6dl-mba6b-u-boot.dtsi
new file mode 100644
index 000000000000..bb17ba9b4249
--- /dev/null
+++ b/arch/arm/dts/imx6dl-mba6b-u-boot.dtsi
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "imx6qdl-mba6-u-boot.dtsi"
diff --git a/arch/arm/dts/imx6q-mba6b-u-boot.dtsi
b/arch/arm/dts/imx6q-mba6b-u-boot.dtsi
new file mode 100644
index 000000000000..bb17ba9b4249
--- /dev/null
+++ b/arch/arm/dts/imx6q-mba6b-u-boot.dtsi
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "imx6qdl-mba6-u-boot.dtsi"
diff --git a/arch/arm/dts/imx6qdl-mba6-u-boot.dtsi
b/arch/arm/dts/imx6qdl-mba6-u-boot.dtsi
new file mode 100644
index 000000000000..78457ef68f4f
--- /dev/null
+++ b/arch/arm/dts/imx6qdl-mba6-u-boot.dtsi
@@ -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;
+};
diff --git a/configs/tqma6dl_mba6_mmc_defconfig
b/configs/tqma6dl_mba6_mmc_defconfig
index 1a1d253c50ee..1534a2e9262a 100644
--- a/configs/tqma6dl_mba6_mmc_defconfig
+++ b/configs/tqma6dl_mba6_mmc_defconfig
@@ -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
diff --git a/configs/tqma6dl_mba6_spi_defconfig
b/configs/tqma6dl_mba6_spi_defconfig
index c6a1c7cf3d7d..5eaa9eb270ce 100644
--- a/configs/tqma6dl_mba6_spi_defconfig
+++ b/configs/tqma6dl_mba6_spi_defconfig
@@ -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
diff --git a/configs/tqma6q_mba6_mmc_defconfig
b/configs/tqma6q_mba6_mmc_defconfig
index 27f949c6ef68..3fcc1f8d54e1 100644
--- a/configs/tqma6q_mba6_mmc_defconfig
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@ -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
diff --git a/configs/tqma6q_mba6_spi_defconfig
b/configs/tqma6q_mba6_spi_defconfig
index 5d3ce79c35d9..a7ffc9edb5b4 100644
--- a/configs/tqma6q_mba6_spi_defconfig
+++ b/configs/tqma6q_mba6_spi_defconfig
@@ -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
diff --git a/configs/tqma6s_mba6_mmc_defconfig
b/configs/tqma6s_mba6_mmc_defconfig
index a9ed0d3fc2c6..7839c4858478 100644
--- a/configs/tqma6s_mba6_mmc_defconfig
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@ -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
diff --git a/configs/tqma6s_mba6_spi_defconfig
b/configs/tqma6s_mba6_spi_defconfig
index 9cd8c3dd20f4..c3bb44025b34 100644
--- a/configs/tqma6s_mba6_spi_defconfig
+++ b/configs/tqma6s_mba6_spi_defconfig
@@ -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
--
2.34.1
