diff options
Diffstat (limited to 'drivers/watchdog/imx2_wdt.c')
| -rw-r--r-- | drivers/watchdog/imx2_wdt.c | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index e5c162b05376..714e2b2a6a35 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -2,7 +2,8 @@ * Watchdog driver for IMX2 and later processors * * Copyright (C) 2010 Wolfram Sang, Pengutronix e.K. <w.sang@pengutronix.de> - * Copyright (C) 2014 Freescale Semiconductor, Inc. + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * Copyright 2017 NXP. * * some parts adapted by similar drivers from Darius Augulis and Vladimir * Zapolskiy, additional improvements by Wim Van Sebroeck. @@ -92,6 +93,26 @@ static const struct watchdog_info imx2_wdt_pretimeout_info = { WDIOF_PRETIMEOUT, }; +static int imx2_wdt_ping(struct watchdog_device *wdog) +{ + struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog); + + regmap_write(wdev->regmap, IMX2_WDT_WSR, IMX2_WDT_SEQ1); + regmap_write(wdev->regmap, IMX2_WDT_WSR, IMX2_WDT_SEQ2); + return 0; +} + + +static inline bool imx2_wdt_is_running(struct imx2_wdt_device *wdev) +{ + u32 val; + + regmap_read(wdev->regmap, IMX2_WDT_WCR, &val); + + return val & IMX2_WDT_WCR_WDE; +} + + static int imx2_wdt_restart(struct watchdog_device *wdog, unsigned long action, void *data) { @@ -106,6 +127,10 @@ static int imx2_wdt_restart(struct watchdog_device *wdog, unsigned long action, /* Assert SRS signal */ regmap_write(wdev->regmap, IMX2_WDT_WCR, wcr_enable); + + if (imx2_wdt_is_running(wdev)) + imx2_wdt_ping(wdog); + /* * Due to imx6q errata ERR004346 (WDOG: WDOG SRS bit requires to be * written twice), we add another two writes to ensure there must be at @@ -117,7 +142,9 @@ static int imx2_wdt_restart(struct watchdog_device *wdog, unsigned long action, regmap_write(wdev->regmap, IMX2_WDT_WCR, wcr_enable); /* wait for reset to assert... */ - mdelay(500); + mdelay(100); + dev_err(wdog->parent, "failed to assert %s reset, trying with timeout\n", + wdev->ext_reset ? "external" : "internal"); return 0; } @@ -151,24 +178,6 @@ static inline void imx2_wdt_setup(struct watchdog_device *wdog) regmap_write(wdev->regmap, IMX2_WDT_WCR, val); } -static inline bool imx2_wdt_is_running(struct imx2_wdt_device *wdev) -{ - u32 val; - - regmap_read(wdev->regmap, IMX2_WDT_WCR, &val); - - return val & IMX2_WDT_WCR_WDE; -} - -static int imx2_wdt_ping(struct watchdog_device *wdog) -{ - struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog); - - regmap_write(wdev->regmap, IMX2_WDT_WSR, IMX2_WDT_SEQ1); - regmap_write(wdev->regmap, IMX2_WDT_WSR, IMX2_WDT_SEQ2); - return 0; -} - static void __imx2_wdt_set_timeout(struct watchdog_device *wdog, unsigned int new_timeout) { |