watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options
authorAhmad Fatoum <a.fatoum@pengutronix.de>
Thu, 11 Jun 2020 19:17:43 +0000 (21:17 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Aug 2020 07:48:19 +0000 (09:48 +0200)
commit e871e93fb08a619dfc015974a05768ed6880fd82 upstream.

The driver supports populating bootstatus with WDIOF_CARDRESET, but so
far userspace couldn't portably determine whether absence of this flag
meant no watchdog reset or no driver support. Or-in the bit to fix this.

Fixes: b97cb21a4634 ("watchdog: f71808e_wdt: Fix WDTMOUT_STS register read")
Cc: stable@vger.kernel.org
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20200611191750.28096-3-a.fatoum@pengutronix.de
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/watchdog/f71808e_wdt.c

index 88cd2a52d8d3244318c738e354129fcd3f65c8fe..2ad84c293b586ed6354ecc5d569ee42aa88e22c7 100644 (file)
@@ -690,7 +690,8 @@ static int __init watchdog_init(int sioaddr)
        watchdog.sioaddr = sioaddr;
        watchdog.ident.options = WDIOC_SETTIMEOUT
                                | WDIOF_MAGICCLOSE
-                               | WDIOF_KEEPALIVEPING;
+                               | WDIOF_KEEPALIVEPING
+                               | WDIOF_CARDRESET;
 
        snprintf(watchdog.ident.identity,
                sizeof(watchdog.ident.identity), "%s watchdog",