MLK-25481 imx8mm/mn/mp: Keep watchdog disabled by default

WDOG HW can't be disabled once it is enabled. So after u-boot enables
the watchdog, kernel has to service the watchdog all the time.
However when suspend into s2idle mode, the WDOG counter is not stop,
then cause WDOG timeout and reset the system.

Change to not enable WDOG by default in u-boot to align previous release.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>

diff --git a/configs/imx8mm_ddr3l_val_defconfig b/configs/imx8mm_ddr3l_val_defconfig
index ef5af88..fe1bd9c 100644 (file)
--- a/configs/imx8mm_ddr3l_val_defconfig
+++ b/configs/imx8mm_ddr3l_val_defconfig
@@ -106,7 +106,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y

diff --git a/configs/imx8mm_ddr4_evk_defconfig b/configs/imx8mm_ddr4_evk_defconfig
index 143d992..6971c04 100644 (file)
--- a/configs/imx8mm_ddr4_evk_defconfig
+++ b/configs/imx8mm_ddr4_evk_defconfig
@@ -105,7 +105,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mm_ddr4_evk_nand_defconfig b/configs/imx8mm_ddr4_evk_nand_defconfig
index 6ea5e25..e746376 100644 (file)
--- a/configs/imx8mm_ddr4_evk_nand_defconfig
+++ b/configs/imx8mm_ddr4_evk_nand_defconfig
@@ -102,7 +102,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mm_ddr4_val_defconfig b/configs/imx8mm_ddr4_val_defconfig
index 2447fda..12f3b82 100644 (file)
--- a/configs/imx8mm_ddr4_val_defconfig
+++ b/configs/imx8mm_ddr4_val_defconfig
@@ -110,7 +110,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig
index d306a44..ca8fee2 100644 (file)
--- a/configs/imx8mm_evk_defconfig
+++ b/configs/imx8mm_evk_defconfig
@@ -136,7 +136,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mm_evk_fspi_defconfig b/configs/imx8mm_evk_fspi_defconfig
index 6046956..4feb8b7 100644 (file)
--- a/configs/imx8mm_evk_fspi_defconfig
+++ b/configs/imx8mm_evk_fspi_defconfig
@@ -120,7 +120,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mm_evk_qca_defconfig b/configs/imx8mm_evk_qca_defconfig
index 10ed614..a1e3954 100644 (file)
--- a/configs/imx8mm_evk_qca_defconfig
+++ b/configs/imx8mm_evk_qca_defconfig
@@ -119,7 +119,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mm_evk_qca_fspi_defconfig b/configs/imx8mm_evk_qca_fspi_defconfig
index 4019087..a864721 100644 (file)
--- a/configs/imx8mm_evk_qca_fspi_defconfig
+++ b/configs/imx8mm_evk_qca_fspi_defconfig
@@ -120,7 +120,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mn_ddr3l_evk_defconfig b/configs/imx8mn_ddr3l_evk_defconfig
index 17129a1..e80d182 100644 (file)
--- a/configs/imx8mn_ddr3l_evk_defconfig
+++ b/configs/imx8mn_ddr3l_evk_defconfig
@@ -129,7 +129,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig
index 46493f2..1c1d1cb 100644 (file)
--- a/configs/imx8mn_ddr4_evk_defconfig
+++ b/configs/imx8mn_ddr4_evk_defconfig
@@ -129,7 +129,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mn_ddr4_evk_ld_defconfig b/configs/imx8mn_ddr4_evk_ld_defconfig
index 827ec22..97d2e87 100644 (file)
--- a/configs/imx8mn_ddr4_evk_ld_defconfig
+++ b/configs/imx8mn_ddr4_evk_ld_defconfig
@@ -129,7 +129,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig
index 3ff3f5f..ef5647e 100644 (file)
--- a/configs/imx8mn_evk_defconfig
+++ b/configs/imx8mn_evk_defconfig
@@ -129,7 +129,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mn_evk_ld_defconfig b/configs/imx8mn_evk_ld_defconfig
index 737a3c0..730ee15 100644 (file)
--- a/configs/imx8mn_evk_ld_defconfig
+++ b/configs/imx8mn_evk_ld_defconfig
@@ -129,7 +129,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mp_ddr4_evk_defconfig b/configs/imx8mp_ddr4_evk_defconfig
index 61ed476..57214b3 100644 (file)
--- a/configs/imx8mp_ddr4_evk_defconfig
+++ b/configs/imx8mp_ddr4_evk_defconfig
@@ -125,7 +125,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mp_ddr4_evk_inline_ecc_defconfig b/configs/imx8mp_ddr4_evk_inline_ecc_defconfig
index b959a40..4882a79 100644 (file)
--- a/configs/imx8mp_ddr4_evk_inline_ecc_defconfig
+++ b/configs/imx8mp_ddr4_evk_inline_ecc_defconfig
@@ -125,7 +125,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mp_ddr4_evk_nand_defconfig b/configs/imx8mp_ddr4_evk_nand_defconfig
index 7a0a1fe..9454062 100644 (file)
--- a/configs/imx8mp_ddr4_evk_nand_defconfig
+++ b/configs/imx8mp_ddr4_evk_nand_defconfig
@@ -124,7 +124,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y

diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig
index 31a2efe..8c7ede8 100644 (file)
--- a/configs/imx8mp_evk_defconfig
+++ b/configs/imx8mp_evk_defconfig
@@ -137,7 +137,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y
@@ -168,4 +167,4 @@ CONFIG_VIDEO_ADV7535=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
-CONFIG_CMD_BMP=y
\ No newline at end of file
+CONFIG_CMD_BMP=y

diff --git a/configs/imx8mp_evk_inline_ecc_defconfig b/configs/imx8mp_evk_inline_ecc_defconfig
index 3ed120e..9116c4f 100644 (file)
--- a/configs/imx8mp_evk_inline_ecc_defconfig
+++ b/configs/imx8mp_evk_inline_ecc_defconfig
@@ -137,7 +137,6 @@ CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
 CONFIG_DM_THERMAL=y
-CONFIG_IMX_WATCHDOG=y
 CONFIG_IMX_TMU=y
 CONFIG_USB_TCPC=y
 CONFIG_USB=y
@@ -170,4 +169,4 @@ CONFIG_VIDEO_ADV7535=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
-CONFIG_CMD_BMP=y
\ No newline at end of file
+CONFIG_CMD_BMP=y