aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2014-10-14 15:25:19 -0400
committerWim Van Sebroeck <wim@iguana.be>2015-02-17 15:32:36 -0500
commitfb1cbeaeed0f41965ead2714bfc9c579188c6146 (patch)
tree2a2b3987a9abad6739ffefad67a33960caedbbba
parenta6f8f81ec77ba5e5f0b3249dfd3fc554ac5db117 (diff)
watchdog: Fix omap watchdogs to enable the magic close bit
This allows testing the watchdog easily with distros just by doing pkill -9 watchdog. Reported-by: Thomas Dziedzic <gostrc@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Felipe Balbi <balbi@ti.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/watchdog/omap_wdt.c2
-rw-r--r--drivers/watchdog/retu_wdt.c2
-rw-r--r--drivers/watchdog/twl4030_wdt.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 9f2709db61ca..1e6be9e40577 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -189,7 +189,7 @@ static int omap_wdt_set_timeout(struct watchdog_device *wdog,
189} 189}
190 190
191static const struct watchdog_info omap_wdt_info = { 191static const struct watchdog_info omap_wdt_info = {
192 .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, 192 .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
193 .identity = "OMAP Watchdog", 193 .identity = "OMAP Watchdog",
194}; 194};
195 195
diff --git a/drivers/watchdog/retu_wdt.c b/drivers/watchdog/retu_wdt.c
index a7a0695971e4..b7c68e275aeb 100644
--- a/drivers/watchdog/retu_wdt.c
+++ b/drivers/watchdog/retu_wdt.c
@@ -94,7 +94,7 @@ static int retu_wdt_set_timeout(struct watchdog_device *wdog,
94} 94}
95 95
96static const struct watchdog_info retu_wdt_info = { 96static const struct watchdog_info retu_wdt_info = {
97 .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, 97 .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
98 .identity = "Retu watchdog", 98 .identity = "Retu watchdog",
99}; 99};
100 100
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index 12c15903d098..2c1db6fa9a27 100644
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -57,7 +57,7 @@ static int twl4030_wdt_set_timeout(struct watchdog_device *wdt,
57} 57}
58 58
59static const struct watchdog_info twl4030_wdt_info = { 59static const struct watchdog_info twl4030_wdt_info = {
60 .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, 60 .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
61 .identity = "TWL4030 Watchdog", 61 .identity = "TWL4030 Watchdog",
62}; 62};
63 63