From: Lukasz Majewski Date: Sun, 19 Feb 2017 23:24:41 +0100 Subject: [U-Boot] [PATCH 6/7] ti: wdt: omap: Use CONFIG_HW_WATCHDOG_TIMEOUT_MS to specify watchdog timeout In-Reply-To: <1487543082-24746-1-git-send-email-lukma@denx.de> References: <1487543082-24746-1-git-send-email-lukma@denx.de> Message-ID: <1487543082-24746-8-git-send-email-lukma@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Now it is possible to specify in the config file the time after which watchdog will trigger. The flag itself has been reused from designware watchdog code (./drivers/watchdog/designware_wdt.c). Signed-off-by: Lukasz Majewski --- drivers/watchdog/omap_wdt.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 7b1f429..5a2126b 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c @@ -45,7 +45,9 @@ #include /* Hardware timeout in seconds */ -#define WDT_HW_TIMEOUT 60 +#ifndef CONFIG_HW_WATCHDOG_TIMEOUT_MS +#define CONFIG_HW_WATCHDOG_TIMEOUT_MS 60000 +#endif static unsigned int wdt_trgr_pattern = 0x1234; @@ -68,7 +70,7 @@ void hw_watchdog_reset(void) static int omap_wdt_set_timeout(unsigned int timeout) { struct wd_timer *wdt = (struct wd_timer *)WDT_BASE; - u32 pre_margin = GET_WLDR_VAL(timeout); + u32 pre_margin = GET_WLDR_VAL(timeout / 1000); /* just count up at 32 KHz */ while (readl(&wdt->wdtwwps) & WDT_WWPS_PEND_WLDR) @@ -115,7 +117,7 @@ void hw_watchdog_init(void) while (readl(&wdt->wdtwwps) & WDT_WWPS_PEND_WCLR) ; - omap_wdt_set_timeout(WDT_HW_TIMEOUT); + omap_wdt_set_timeout(CONFIG_HW_WATCHDOG_TIMEOUT_MS); /* Sequence to enable the watchdog */ writel(0xBBBB, &wdt->wdtwspr); -- 2.1.4