summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorDavid Cohen <david.a.cohen@linux.intel.com>2015-10-06 01:49:58 +0200
committerWim Van Sebroeck <wim@iguana.be>2015-10-28 22:58:32 +0100
commit8cbb97ea3e386eb95ecbd99260d681792963cebf (patch)
tree7119cee9a5df1ed8dc3b96aa6363573405aa2e1e /drivers/watchdog
parentwatchdog: imx2_wdt: Use register definition in regmap_write() (diff)
downloadlinux-8cbb97ea3e386eb95ecbd99260d681792963cebf.tar.xz
linux-8cbb97ea3e386eb95ecbd99260d681792963cebf.zip
watchdog: intel-mid: add Magic Closure flag
Adding WDIOF_MAGICCLOSE to Intel MID watchdog driver. Once the watchdog is opened, it makes sense to disable watchdog only if it was gracefully released. Signed-off-by: David Cohen <david.a.cohen@linux.intel.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/intel-mid_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/intel-mid_wdt.c b/drivers/watchdog/intel-mid_wdt.c
index 0a436b5d1e84..db36d12e2b52 100644
--- a/drivers/watchdog/intel-mid_wdt.c
+++ b/drivers/watchdog/intel-mid_wdt.c
@@ -101,7 +101,7 @@ static irqreturn_t mid_wdt_irq(int irq, void *dev_id)
static const struct watchdog_info mid_wdt_info = {
.identity = "Intel MID SCU watchdog",
- .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT,
+ .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
};
static const struct watchdog_ops mid_wdt_ops = {