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: devicetree@vger.kernel.org,
Marcus Folkesson <marcus.folkesson@gmail.com>,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mediatek@lists.infradead.org,
linux-amlogic@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/7] watchdog: sirfsoc: allow setting timeout in devicetree
Date: Sat, 10 Feb 2018 10:19:07 +0100 [thread overview]
Message-ID: <20180210091911.3644-3-marcus.folkesson@gmail.com> (raw)
In-Reply-To: <20180210091911.3644-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>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
---
Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt | 4 ++++
drivers/watchdog/sirfsoc_wdt.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt b/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
index 9cbc76c89b2b..0dce5e3100b4 100644
--- a/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
@@ -5,10 +5,14 @@ Required properties:
- reg: Address range of tick timer/WDT register set
- interrupts: interrupt number to the cpu
+Optional properties:
+- timeout-sec : Contains the watchdog timeout in seconds
+
Example:
timer@b0020000 {
compatible = "sirf,prima2-tick";
reg = <0xb0020000 0x1000>;
interrupts = <0>;
+ timeout-sec = <30>;
};
diff --git a/drivers/watchdog/sirfsoc_wdt.c b/drivers/watchdog/sirfsoc_wdt.c
index 4eea351e09b0..ac0c9d2c4aee 100644
--- a/drivers/watchdog/sirfsoc_wdt.c
+++ b/drivers/watchdog/sirfsoc_wdt.c
@@ -29,7 +29,7 @@
#define SIRFSOC_WDT_MAX_TIMEOUT (10 * 60) /* 10 mins */
#define SIRFSOC_WDT_DEFAULT_TIMEOUT 30 /* 30 secs */
-static unsigned int timeout = SIRFSOC_WDT_DEFAULT_TIMEOUT;
+static unsigned int timeout;
static bool nowayout = WATCHDOG_NOWAYOUT;
module_param(timeout, uint, 0);
--
2.15.1
next prev parent reply other threads:[~2018-02-10 9:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-10 9:19 [PATCH v2 1/7] watchdog: sama5d4: make use of timeout-secs provided in devicetree Marcus Folkesson
2018-02-10 9:19 ` Marcus Folkesson [this message]
2018-02-10 9:19 ` [PATCH v2 4/7] watchdog: pnx4008: " Marcus Folkesson
2018-02-10 9:19 ` [PATCH v2 5/7] watchdog: mtk: allow setting timeout " Marcus Folkesson
2018-02-10 11:10 ` Sean Wang
2018-02-10 12:43 ` Marcus Folkesson
2018-02-10 20:12 ` Marcus Folkesson
[not found] ` <20180210201207.GC744-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-02-11 1:52 ` Guenter Roeck
[not found] ` <5449674d-2812-c9b5-9c06-af2fbfa72737-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2018-02-11 7:46 ` Sean Wang
2018-02-11 11:17 ` Guenter Roeck
2018-02-10 9:19 ` [PATCH v2 6/7] watchdog: meson: " Marcus Folkesson
2018-02-10 9:19 ` [PATCH v2 7/7] watchdog: coh901327: make use of timeout-secs provided " Marcus Folkesson
[not found] ` <20180210091911.3644-7-marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-02-11 17:33 ` [v2, " Guenter Roeck
2018-02-22 14:00 ` [PATCH v2 " Linus Walleij
[not found] ` <20180210091911.3644-1-marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-02-10 9:19 ` [PATCH v2 2/7] watchdog: sunxi: allow setting timeout " Marcus Folkesson
2018-02-10 14:29 ` [PATCH v2 1/7] watchdog: sama5d4: make use of timeout-secs provided " Alexandre Belloni
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=20180210091911.3644-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).