summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorMarcus Folkesson <marcus.folkesson@gmail.com>2018-02-11 21:08:42 +0100
committerWim Van Sebroeck <wim@linux-watchdog.org>2018-03-03 17:04:13 +0100
commit1d1dedc2169416198a48cd43cee9bdd1a9c939ac (patch)
tree00faa52edafd88b99478a5170cc2c4879abe3248 /drivers/watchdog
parent976932e40036179d71d40c76fc559b4b19912bac (diff)
downloadlinux-stable-1d1dedc2169416198a48cd43cee9bdd1a9c939ac.tar.gz
linux-stable-1d1dedc2169416198a48cd43cee9bdd1a9c939ac.tar.bz2
linux-stable-1d1dedc2169416198a48cd43cee9bdd1a9c939ac.zip
watchdog: sunxi: allow setting timeout in devicetree
watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout. By following best practice described in Documentation/watchdog/watchdog-kernel-api.txt, it also let us to set timout-sec property in devicetree. Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Rob Herring <robh@kernel.org> Reviewed-by: Chen-Yu Tsai <wens@csie.org> Signed-off-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/sunxi_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
index 802e31b1416d..c6c73656997e 100644
--- a/drivers/watchdog/sunxi_wdt.c
+++ b/drivers/watchdog/sunxi_wdt.c
@@ -39,7 +39,7 @@
#define DRV_VERSION "1.0"
static bool nowayout = WATCHDOG_NOWAYOUT;
-static unsigned int timeout = WDT_MAX_TIMEOUT;
+static unsigned int timeout;
/*
* This structure stores the register offsets for different variants