aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorMarcus Folkesson <marcus.folkesson@gmail.com>2018-02-11 21:08:46 +0100
committerWim Van Sebroeck <wim@linux-watchdog.org>2018-03-03 17:04:14 +0100
commit4590d62cb16bebdc36b951067eeeaef02ea213c3 (patch)
tree752d9744bc889ac6f243074b6f40cfd1699d3329 /drivers/watchdog
parentwatchdog: mtk: allow setting timeout in devicetree (diff)
downloadlinux-dev-4590d62cb16bebdc36b951067eeeaef02ea213c3.tar.xz
linux-dev-4590d62cb16bebdc36b951067eeeaef02ea213c3.zip
watchdog: meson: 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> 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/meson_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
index 304274c67735..cd0275a6cdac 100644
--- a/drivers/watchdog/meson_wdt.c
+++ b/drivers/watchdog/meson_wdt.c
@@ -36,7 +36,7 @@
#define MESON_SEC_TO_TC(s, c) ((s) * (c))
static bool nowayout = WATCHDOG_NOWAYOUT;
-static unsigned int timeout = MESON_WDT_TIMEOUT;
+static unsigned int timeout;
struct meson_wdt_data {
unsigned int enable;