diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2014-09-08 09:14:07 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2015-01-21 14:52:23 +0100 |
| commit | 5fe65ce7ccbb47b16e17a88bcdac73cffadb80fa (patch) | |
| tree | 3eafc26049c47fd996e00eeea53773ae8a7038d3 /drivers/watchdog/imx2_wdt.c | |
| parent | watchdog: imx2_wdt: Improve power management support. (diff) | |
| download | linux-5fe65ce7ccbb47b16e17a88bcdac73cffadb80fa.tar.xz linux-5fe65ce7ccbb47b16e17a88bcdac73cffadb80fa.zip | |
watchdog: imx2_wdt: Disable power down counter on boot
Disable power down counter of the watchdog to avoid system resets. The
watchdog power down counter is set automatically by the chip. If it is
not set to 0 in the driver, the system resets.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/imx2_wdt.c')
| -rw-r--r-- | drivers/watchdog/imx2_wdt.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index c50c7d85689f..5142bbabe027 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -52,6 +52,8 @@ #define IMX2_WDT_WRSR 0x04 /* Reset Status Register */ #define IMX2_WDT_WRSR_TOUT (1 << 1) /* -> Reset due to Timeout */ +#define IMX2_WDT_WMCR 0x08 /* Misc Register */ + #define IMX2_WDT_MAX_TIME 128 #define IMX2_WDT_DEFAULT_TIME 60 /* in seconds */ @@ -274,6 +276,13 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) imx2_wdt_ping_if_active(wdog); + /* + * Disable the watchdog power down counter at boot. Otherwise the power + * down counter will pull down the #WDOG interrupt line for one clock + * cycle. + */ + regmap_write(wdev->regmap, IMX2_WDT_WMCR, 0); + ret = watchdog_register_device(wdog); if (ret) { dev_err(&pdev->dev, "cannot register watchdog device\n"); |