From 315e8853bcc2c6c842b5a67e0e87b7d7bb90d999 Mon Sep 17 00:00:00 2001 From: "Ye.Li" Date: Fri, 15 May 2015 14:25:14 +0800 Subject: 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 --- drivers/watchdog/imx_watchdog.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'drivers') 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 #include #include +#include #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 */ -- cgit v1.1