summaryrefslogtreecommitdiff
authorXingyu Chen <xingyu.chen@amlogic.com>2019-10-09 02:34:55 (GMT)
committer zihuan.ling <zihuan.ling@amlogic.com>2019-10-12 01:37:33 (GMT)
commitdceb0da4f4ab74178571c6ae0c0b0e1394739bb6 (patch)
treeff2c2c3f40c4491e47f99a9467b2c6876f087a02
parenta5c0ac1d45df6b830f69b9d3302c035420e0bac2 (diff)
downloadcommon-dceb0da4f4ab74178571c6ae0c0b0e1394739bb6.zip
common-dceb0da4f4ab74178571c6ae0c0b0e1394739bb6.tar.gz
common-dceb0da4f4ab74178571c6ae0c0b0e1394739bb6.tar.bz2
wdt: add option to avoid the wdt is disabled casually [1/1]
PD#SWPL-14925 Problem: The system can't be reset by wdt which is fed by the tv-service when the tv-service is abnormally hanged. Solution: Add extra option to avoid the wdt is disabled when the fed dog thread aborts, but we can disable wdt when certain condition is met. Verify: test pass on customer board Change-Id: I1fd5ff4e36f06bda99726c0a2ced399299596f95 Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
Diffstat
-rw-r--r--drivers/amlogic/watchdog/meson_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/amlogic/watchdog/meson_wdt.c b/drivers/amlogic/watchdog/meson_wdt.c
index bb48362..30225a7 100644
--- a/drivers/amlogic/watchdog/meson_wdt.c
+++ b/drivers/amlogic/watchdog/meson_wdt.c
@@ -177,7 +177,7 @@ static void boot_moniter_work(struct work_struct *work)
}
static const struct watchdog_info aml_wdt_info = {
- .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
.identity = "aml Watchdog",
};