diff options
author | Ye.Li <B37916@freescale.com> | 2015-05-15 14:25:14 +0800 |
---|---|---|
committer | Ye Li <ye.li@nxp.com> | 2016-03-25 11:18:13 +0800 |
commit | 315e8853bcc2c6c842b5a67e0e87b7d7bb90d999 (patch) | |
tree | f76fc25a6a5db535e823d97e7a6eb2bf6aff70ec | |
parent | 199a386428a7ec25d60867ffac7fc5134dc50e6a (diff) | |
download | u-boot-imx-315e8853bcc2c6c842b5a67e0e87b7d7bb90d999.zip u-boot-imx-315e8853bcc2c6c842b5a67e0e87b7d7bb90d999.tar.gz u-boot-imx-315e8853bcc2c6c842b5a67e0e87b7d7bb90d999.tar.bz2 |
MLK-10931 imx: wdog: Turn off internal reset signal for mx7d
Set wdog WCR register SRS bit to turn off internal reset signal WDOG_RESET_B_DEB
for mx7d. So that the warm reset is disabled.
Signed-off-by: Ye.Li <B37916@freescale.com>
-rw-r--r-- | drivers/watchdog/imx_watchdog.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c index f9f8175..43a83da 100644 --- a/drivers/watchdog/imx_watchdog.c +++ b/drivers/watchdog/imx_watchdog.c @@ -9,6 +9,7 @@ #include <watchdog.h> #include <asm/arch/imx-regs.h> #include <fsl_wdog.h> +#include <asm/arch/sys_proto.h> #ifdef CONFIG_IMX_WATCHDOG void hw_watchdog_reset(void) @@ -43,7 +44,10 @@ void reset_cpu(ulong addr) { struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR; - clrsetbits_le16(&wdog->wcr, WCR_WT_MSK, WCR_WDE); + if (is_cpu_type(MXC_CPU_MX7D)) + clrsetbits_le16(&wdog->wcr, WCR_WT_MSK, (WCR_WDE | WCR_SRS)); + else + clrsetbits_le16(&wdog->wcr, WCR_WT_MSK, WCR_WDE); writew(0x5555, &wdog->wsr); writew(0xaaaa, &wdog->wsr); /* load minimum 1/2 second timeout */ |