From 08edcce8a45935eb71272ae505fedec094b08d15 Mon Sep 17 00:00:00 2001 From: Xingyu Chen Date: Wed, 9 Oct 2019 10:34:55 +0800 Subject: [PATCH] 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 --- drivers/amlogic/watchdog/meson_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/amlogic/watchdog/meson_wdt.c b/drivers/amlogic/watchdog/meson_wdt.c index bb48362118d2..30225a7b65e5 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", };