ARM: imx6: DHCOM i.MX6 PDK: Fixing reset
v2 cover ARM: imx6: DHCOM i.MX6 PDK: Fixing reset
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
Signature · 1 line
2.21.0
PATCH v2 1/2 ARM: dts: dh-imx6: add u-boot specific wdt-reboot node
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.
--- 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
arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi new file +11 -0
@@ -0,0 +1,11 @@ +// SPDX-License-Identifier: (GPL-2.0+) +/* + * Copyright (C) 2019 Claudius Heine <[email protected]> + */ + +/ { + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + }; +};
Signature · 1 line
2.21.0
PATCH v2 1/2 ARM: dts: dh-imx6: add u-boot specific wdt-reboot node
Quoted 4 lines
The wdt-reboot node is needed for the
sysreset_watchdogdriver to register a watchdog as a reset handler in case 'CONFIG_SYSRESET' is enabled.Signed-off-by Claudius Heine <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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 =====================================================================
PATCH v2 2/2 ARM: imx6: DHCOM i.MX6 PDK: Enable sysreset driver and wdt command
In reply to Claudius HeineThe 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")
--- configs/dh_imx6_defconfig | 3 +++ include/configs/dh_imx6.h | 5 +++++ 2 files changed, 8 insertions(+)
configs/dh_imx6_defconfig +3 -0
@@ -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
include/configs/dh_imx6.h +5 -0
@@ -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
Signature · 1 line
2.21.0
PATCH v2 2/2 ARM: imx6: DHCOM i.MX6 PDK: Enable sysreset driver and wdt command
Quoted 5 lines
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 afterf2929d11a639("watchdog: imx: Use
immediate reset bits forexpire_now")Signed-off-by Claudius Heine <[email protected]>
Applied to u-boot-imx, -next, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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 =====================================================================