* [U-Boot] [PATCH] imx_watchdog: do not soft-reset while watchdog init
@ 2013-09-30 10:52 Anatolij Gustschin
2013-10-31 16:59 ` Stefano Babic
0 siblings, 1 reply; 2+ messages in thread
From: Anatolij Gustschin @ 2013-09-30 10:52 UTC (permalink / raw)
To: u-boot
Currently the driver clears WCR_SRS bit when enabling
the watchdog and this causes a software reset. Do not
clear WCR_SRS.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
drivers/watchdog/imx_watchdog.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
index 50e602a..d5993b4 100644
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -19,6 +19,7 @@ struct watchdog_regs {
#define WCR_WDBG 0x02
#define WCR_WDE 0x04 /* WDOG enable */
#define WCR_WDT 0x08
+#define WCR_SRS 0x10
#define WCR_WDW 0x80
#define SET_WCR_WT(x) (x << 8)
@@ -45,7 +46,7 @@ void hw_watchdog_init(void)
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 128000
#endif
timeout = (CONFIG_WATCHDOG_TIMEOUT_MSECS / 500) - 1;
- writew(WCR_WDZST | WCR_WDBG | WCR_WDE | WCR_WDT |
+ writew(WCR_WDZST | WCR_WDBG | WCR_WDE | WCR_WDT | WCR_SRS |
WCR_WDW | SET_WCR_WT(timeout), &wdog->wcr);
hw_watchdog_reset();
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH] imx_watchdog: do not soft-reset while watchdog init
2013-09-30 10:52 [U-Boot] [PATCH] imx_watchdog: do not soft-reset while watchdog init Anatolij Gustschin
@ 2013-10-31 16:59 ` Stefano Babic
0 siblings, 0 replies; 2+ messages in thread
From: Stefano Babic @ 2013-10-31 16:59 UTC (permalink / raw)
To: u-boot
On 30/09/2013 12:52, Anatolij Gustschin wrote:
> Currently the driver clears WCR_SRS bit when enabling
> the watchdog and this causes a software reset. Do not
> clear WCR_SRS.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-31 16:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-30 10:52 [U-Boot] [PATCH] imx_watchdog: do not soft-reset while watchdog init Anatolij Gustschin
2013-10-31 16:59 ` Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox