[U-Boot] [PATCH v2 0/2] ARM: imx6: DHCOM i.MX6 PDK: Fixing reset

[U-Boot] [PATCH v2 0/2] ARM: imx6: DHCOM i.MX6 PDK: Fixing reset

[Claudius Heine]

Hi,

here the second version of those patches.

regards,
Claudius

Changes from v1:
 - u-boot specific wdt-reboot device node now in separate dtsi
 - Squashed patch 2 to 4, because possible bisecting issues in certain configurations (when SPL needs to use do_reset)
 - Improved patch description: more detailed and descriptive

Claudius Heine (2):
  ARM: dts: dh-imx6: add u-boot specific wdt-reboot node
  ARM: imx6: DHCOM i.MX6 PDK: Enable sysreset driver and wdt command

 arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi | 11 +++++++++++
 configs/dh_imx6_defconfig                 |  3 +++
 include/configs/dh_imx6.h                 |  5 +++++
 3 files changed, 19 insertions(+)
 create mode 100644 arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi

-- 
2.21.0

[U-Boot] [PATCH v2 1/2] ARM: dts: dh-imx6: add u-boot specific wdt-reboot node

[Claudius Heine]

The wdt-reboot node is needed for the sysreset_watchdog driver to
register a watchdog as a reset handler in case 'CONFIG_SYSRESET' is
enabled.

Signed-off-by: Claudius Heine <ch@denx.de>
---
 arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi

diff --git a/arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi b/arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi
new file mode 100644
index 0000000000..b94231edb3
--- /dev/null
+++ b/arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: (GPL-2.0+)
+/*
+ * Copyright (C) 2019 Claudius Heine <ch@denx.de>
+ */
+
+/ {
+	wdt-reboot {
+		compatible = "wdt-reboot";
+		wdt = <&wdog1>;
+	};
+};
-- 
2.21.0

[U-Boot] [PATCH v2 2/2] ARM: imx6: DHCOM i.MX6 PDK: Enable sysreset driver and wdt command

[Claudius Heine]

The SPL does not have DM enabled and therefor still needs to use the
hardware watchdog interface provided by the imx-watchdog driver.

Fixes: broken reset command after f2929d11a639 ("watchdog: imx: Use
       immediate reset bits for expire_now")

Signed-off-by: Claudius Heine <ch@denx.de>
---
 configs/dh_imx6_defconfig | 3 +++
 include/configs/dh_imx6.h | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig
index 4055812007..e5c44381b2 100644
--- a/configs/dh_imx6_defconfig
+++ b/configs/dh_imx6_defconfig
@@ -37,6 +37,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_CMD_WDT=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT4_WRITE=y
@@ -77,6 +78,8 @@ CONFIG_DM_SCSI=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_MXC_SPI=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index d4bd88f511..77074aaa06 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -87,6 +87,11 @@
 #endif
 
 /* Watchdog */
+#if defined(CONFIG_SPL_BUILD)
+#undef CONFIG_WDT
+#undef CONFIG_WATCHDOG
+#define CONFIG_HW_WATCHDOG
+#endif
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-- 
2.21.0

[U-Boot] [PATCH v2 1/2] ARM: dts: dh-imx6: add u-boot specific wdt-reboot node

[sbabic at denx.de]

> The wdt-reboot node is needed for the sysreset_watchdog driver to
> register a watchdog as a reset handler in case 'CONFIG_SYSRESET' is
> enabled.
> Signed-off-by: Claudius Heine <ch@denx.de>
Applied to u-boot-imx, -next, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH v2 2/2] ARM: imx6: DHCOM i.MX6 PDK: Enable sysreset driver and wdt command

[sbabic at denx.de]

> The SPL does not have DM enabled and therefor still needs to use the
> hardware watchdog interface provided by the imx-watchdog driver.
> Fixes: broken reset command after f2929d11a639 ("watchdog: imx: Use
>        immediate reset bits for expire_now")
> Signed-off-by: Claudius Heine <ch@denx.de>
Applied to u-boot-imx, -next, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================