DM: WDT: Convert WDT driver to use DM/DTS (including SYSRESET)

This commit enables support for CONFIG_WDT in the U-Boot proper. Moreover,
the SYSRESET_WATCHDOG driver is used to support 'reset' command.

As SPL is not yet ready for DM conversion, the CONFIG_HW_WATCHDOG is
enabled for it. This allows the legacy SPL code to work properly.

Signed-off-by: Lukasz Majewski <lukma@denx.de>

diff --git a/arch/arm/dts/imx6q-display5-u-boot.dtsi b/arch/arm/dts/imx6q-display5-u-boot.dtsi
index b942218b7ab892de18081a95c2ede3abae41e5e4..aa660b5aeb6513b65480e881f4195af259d91e9b 100644 (file)
--- a/arch/arm/dts/imx6q-display5-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-display5-u-boot.dtsi
@@ -31,6 +31,11 @@
        chosen {
                stdout-path = &uart5;
        };
+
+       wdt-reboot {
+               compatible = "wdt-reboot";
+               wdt = <&wdog1>;
+       };
 };
 
 &i2c3 {

diff --git a/configs/display5_defconfig b/configs/display5_defconfig
index 875ccce1c8cf47bafbc2e8cdcb378888d2acfd85..46bcdaffc835a3d9d8d9bb376285a652bcbbc1b9 100644 (file)
--- a/configs/display5_defconfig
+++ b/configs/display5_defconfig
@@ -49,6 +49,7 @@ CONFIG_CMD_PART=y
 # CONFIG_CMD_PINMUX is not set
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
+CONFIG_CMD_WDT=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
@@ -107,5 +108,7 @@ CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_MXC_UART=y
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_I2C_EDID=y
 CONFIG_IMX_WATCHDOG=y

diff --git a/include/configs/display5.h b/include/configs/display5.h
index bbcb5da7bbde1932aa72862e74e84573bd00fae1..de11ff61c66121514c3115da33975f9599f916fb 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -342,7 +342,11 @@
 
 /* Watchdog */
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS   15000
-
+#if defined(CONFIG_SPL_BUILD)
+#undef CONFIG_WDT
+#undef CONFIG_WATCHDOG
+#define CONFIG_HW_WATCHDOG
+#endif
 /* ENV config */
 #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE                (SZ_64K)