summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2021-01-06 05:25:55 -0800
committerYe Li <ye.li@nxp.com>2021-04-08 03:00:44 -0700
commit44f5949dd94317c918c23854413ac30b7feceaf0 (patch)
treeee93a82d8a7c970b0e6c3dae414c6d34ea01665a
parent185bdaaaf5644319284566e5c340927d28954a1a (diff)
LF-3117 wdog: imx_watchdog: Change default reset_cpu to internal reset
Default reset_cpu in imx_watchdog driver is clearing the WDA bit to assert WDOG_B output. However, this requires the iomuxc for the WDOG_B is configured by board codes or DTS. Without it, next external reset with WDOG_B iomuxc configured will not work. On iMX6, we always use internal reset to support some features like bmode. So the iomuxc for WDOG_B never be set. Change back the reset_cpu to use internal reset. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit aa97f1de484a165212cec56bd8ed38227c8f828a)
-rw-r--r--drivers/watchdog/imx_watchdog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
index 01762df019..47b9422f12 100644
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -44,7 +44,7 @@ void __attribute__((weak)) reset_cpu(ulong addr)
{
struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR;
- imx_watchdog_expire_now(wdog, true);
+ imx_watchdog_expire_now(wdog, false);
}
#endif