From: Marcus Folkesson <marcus.folkesson@gmail.com>
To: Wim Van Sebroeck <wim@iguana.be>,
Guenter Roeck <linux@roeck-us.net>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Carlo Caione <carlo@caione.org>,
Kevin Hilman <khilman@baylibre.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Barry Song <baohua@kernel.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Chen-Yu Tsai <wens@csie.org>,
Linus Walleij <linus.walleij@linaro.org>,
Vladimir Zapolskiy <vz@mleia.com>,
Sylvain Lemieux <slemieux.tyco@gmail.com>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-mediatek@lists.infradead.org,
Marcus Folkesson <marcus.folkesson@gmail.com>
Subject: [PATCH 2/7] watchdog: sunxi: allow setting timeout in devicetree
Date: Fri, 9 Feb 2018 20:27:19 +0100 [thread overview]
Message-ID: <20180209192724.1227-3-marcus.folkesson@gmail.com> (raw)
In-Reply-To: <20180209192724.1227-1-marcus.folkesson@gmail.com>
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>
---
Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt | 4 ++++
drivers/watchdog/sunxi_wdt.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
index 62dd5baad70e..49900e72f6b1 100644
--- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
@@ -6,9 +6,13 @@ Required properties:
"allwinner,sun6i-a31-wdt"
- reg : Specifies base physical address and size of the registers.
+Optional properties:
+- timeout-sec : Contains the watchdog timeout in seconds
+
Example:
wdt: watchdog@1c20c90 {
compatible = "allwinner,sun4i-a10-wdt";
reg = <0x01c20c90 0x10>;
+ timeout-sec = <10>;
};
diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
index 9728fa32c357..55f166bec0ca 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
--
2.15.1
next prev parent reply other threads:[~2018-02-09 19:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-09 19:27 [PATCH 0/7] watchdog: make use of timeout-secs Marcus Folkesson
2018-02-09 19:27 ` [PATCH 1/7] watchdog: sama5d4: make use of timeout-secs provided in devicetree Marcus Folkesson
2018-02-09 19:32 ` Marcus Folkesson
2018-02-09 22:38 ` Guenter Roeck
2018-02-11 17:38 ` [1/7] " Guenter Roeck
2018-02-09 19:27 ` Marcus Folkesson [this message]
2018-02-09 22:39 ` [PATCH 2/7] watchdog: sunxi: allow setting timeout " Guenter Roeck
2018-02-09 19:27 ` [PATCH 3/7] watchdog: sirfsoc: " Marcus Folkesson
2018-02-09 22:40 ` Guenter Roeck
2018-02-09 19:27 ` [PATCH 4/7] watchdog: pnx4008: make use of timeout-secs provided " Marcus Folkesson
2018-02-09 22:41 ` Guenter Roeck
2018-02-09 22:43 ` Guenter Roeck
2018-02-09 19:27 ` [PATCH 5/7] watchdog: mtk: allow setting timeout " Marcus Folkesson
2018-02-09 22:43 ` Guenter Roeck
2018-02-09 19:27 ` [PATCH 6/7] watchdog: meson: " Marcus Folkesson
2018-02-09 22:48 ` Guenter Roeck
2018-02-09 23:19 ` Alexandre Belloni
2018-02-10 0:04 ` Guenter Roeck
2018-02-09 19:27 ` [PATCH 7/7] watchdog: coh901327: make use of timeout-secs provided " Marcus Folkesson
2018-02-09 22:52 ` Guenter Roeck
2018-02-10 8:54 ` Marcus Folkesson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180209192724.1227-3-marcus.folkesson@gmail.com \
--to=marcus.folkesson@gmail.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=baohua@kernel.org \
--cc=carlo@caione.org \
--cc=devicetree@vger.kernel.org \
--cc=khilman@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=maxime.ripard@free-electrons.com \
--cc=nicolas.ferre@microchip.com \
--cc=robh+dt@kernel.org \
--cc=slemieux.tyco@gmail.com \
--cc=vz@mleia.com \
--cc=wens@csie.org \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).