* [U-Boot] [PATCH] imx_watchdog: Do not assert WDOG_B on watchdog init
@ 2016-08-02 8:08 Ross Parker
2016-10-04 9:01 ` Stefano Babic
0 siblings, 1 reply; 2+ messages in thread
From: Ross Parker @ 2016-08-02 8:08 UTC (permalink / raw)
To: u-boot
Currently the driver asserts WDOG_B by clearing WCR_WDA bit when
enabling the watchdog. Do not clear WCR_WDA.
Signed-off-by: Ross Parker <rossjparker@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
---
drivers/watchdog/imx_watchdog.c | 2 +-
include/fsl_wdog.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/watchdog/imx_watchdog.c
b/drivers/watchdog/imx_watchdog.c
index 2938d9f..3f826d1 100644
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -34,7 +34,7 @@ void hw_watchdog_init(void)
#endif
timeout = (CONFIG_WATCHDOG_TIMEOUT_MSECS / 500) - 1;
writew(WCR_WDZST | WCR_WDBG | WCR_WDE | WCR_WDT | WCR_SRS |
- SET_WCR_WT(timeout), &wdog->wcr);
+ WCR_WDA | SET_WCR_WT(timeout), &wdog->wcr);
hw_watchdog_reset();
}
#endif
diff --git a/include/fsl_wdog.h b/include/fsl_wdog.h
index f698d4d..7818f78 100644
--- a/include/fsl_wdog.h
+++ b/include/fsl_wdog.h
@@ -15,5 +15,6 @@ struct watchdog_regs {
#define WCR_WDE 0x04
#define WCR_WDT 0x08
#define WCR_SRS 0x10
+#define WCR_WDA 0x20
#define SET_WCR_WT(x) (x << 8)
#define WCR_WT_MSK SET_WCR_WT(0xFF)
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH] imx_watchdog: Do not assert WDOG_B on watchdog init
2016-08-02 8:08 [U-Boot] [PATCH] imx_watchdog: Do not assert WDOG_B on watchdog init Ross Parker
@ 2016-10-04 9:01 ` Stefano Babic
0 siblings, 0 replies; 2+ messages in thread
From: Stefano Babic @ 2016-10-04 9:01 UTC (permalink / raw)
To: u-boot
On 02/08/2016 10:08, Ross Parker wrote:
> Currently the driver asserts WDOG_B by clearing WCR_WDA bit when
> enabling the watchdog. Do not clear WCR_WDA.
>
> Signed-off-by: Ross Parker <rossjparker@gmail.com
> <mailto:rossjparker@gmail.com>>
> Cc: Stefano Babic <sbabic at denx.de <mailto:sbabic@denx.de>>
>
> ---
Applied to u-boot-imx (after small rebasing), thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
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:[~2016-10-04 9:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-02 8:08 [U-Boot] [PATCH] imx_watchdog: Do not assert WDOG_B on watchdog init Ross Parker
2016-10-04 9:01 ` Stefano Babic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.