All of lore.kernel.org
 help / color / mirror / Atom feed
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 v2 5/7] watchdog: mtk: allow setting timeout in devicetree
Date: Sat, 10 Feb 2018 10:19:09 +0100	[thread overview]
Message-ID: <20180210091911.3644-5-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/mtk-wdt.txt | 4 ++++
 drivers/watchdog/mtk_wdt.c                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
index 5b38a30e608c..859dee167b91 100644
--- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
@@ -11,9 +11,13 @@ Required properties:
 
 - reg : Specifies base physical address and size of the registers.
 
+Optional properties:
+- timeout-sec: contains the watchdog timeout in seconds.
+
 Example:
 
 wdt: watchdog@10000000 {
 	compatible = "mediatek,mt6589-wdt";
 	reg = <0x10000000 0x18>;
+	timeout-sec = <10>;
 };
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 7ed417a765c7..fcdc10ec28a3 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -57,7 +57,7 @@
 #define DRV_VERSION		"1.0"
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
-static unsigned int timeout = WDT_MAX_TIMEOUT;
+static unsigned int timeout;
 
 struct mtk_wdt_dev {
 	struct watchdog_device wdt_dev;
-- 
2.15.1

WARNING: multiple messages have this Message-ID (diff)
From: marcus.folkesson@gmail.com (Marcus Folkesson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 5/7] watchdog: mtk: allow setting timeout in devicetree
Date: Sat, 10 Feb 2018 10:19:09 +0100	[thread overview]
Message-ID: <20180210091911.3644-5-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/mtk-wdt.txt | 4 ++++
 drivers/watchdog/mtk_wdt.c                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
index 5b38a30e608c..859dee167b91 100644
--- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
@@ -11,9 +11,13 @@ Required properties:
 
 - reg : Specifies base physical address and size of the registers.
 
+Optional properties:
+- timeout-sec: contains the watchdog timeout in seconds.
+
 Example:
 
 wdt: watchdog at 10000000 {
 	compatible = "mediatek,mt6589-wdt";
 	reg = <0x10000000 0x18>;
+	timeout-sec = <10>;
 };
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 7ed417a765c7..fcdc10ec28a3 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -57,7 +57,7 @@
 #define DRV_VERSION		"1.0"
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
-static unsigned int timeout = WDT_MAX_TIMEOUT;
+static unsigned int timeout;
 
 struct mtk_wdt_dev {
 	struct watchdog_device wdt_dev;
-- 
2.15.1

WARNING: multiple messages have this Message-ID (diff)
From: marcus.folkesson@gmail.com (Marcus Folkesson)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH v2 5/7] watchdog: mtk: allow setting timeout in devicetree
Date: Sat, 10 Feb 2018 10:19:09 +0100	[thread overview]
Message-ID: <20180210091911.3644-5-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/mtk-wdt.txt | 4 ++++
 drivers/watchdog/mtk_wdt.c                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
index 5b38a30e608c..859dee167b91 100644
--- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
@@ -11,9 +11,13 @@ Required properties:
 
 - reg : Specifies base physical address and size of the registers.
 
+Optional properties:
+- timeout-sec: contains the watchdog timeout in seconds.
+
 Example:
 
 wdt: watchdog at 10000000 {
 	compatible = "mediatek,mt6589-wdt";
 	reg = <0x10000000 0x18>;
+	timeout-sec = <10>;
 };
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 7ed417a765c7..fcdc10ec28a3 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -57,7 +57,7 @@
 #define DRV_VERSION		"1.0"
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
-static unsigned int timeout = WDT_MAX_TIMEOUT;
+static unsigned int timeout;
 
 struct mtk_wdt_dev {
 	struct watchdog_device wdt_dev;
-- 
2.15.1

  parent reply	other threads:[~2018-02-10  9:19 UTC|newest]

Thread overview: 60+ 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
2018-02-10  9:19 ` Marcus Folkesson
2018-02-10  9:19 ` Marcus Folkesson
2018-02-10  9:19 ` [PATCH v2 2/7] watchdog: sunxi: allow setting timeout " Marcus Folkesson
2018-02-10  9:19   ` Marcus Folkesson
2018-02-10  9:19   ` Marcus Folkesson
2018-02-10  9:19   ` Marcus Folkesson
2018-02-10  9:19 ` [PATCH v2 3/7] watchdog: sirfsoc: " Marcus Folkesson
2018-02-10  9:19   ` Marcus Folkesson
2018-02-10  9:19   ` Marcus Folkesson
2018-02-10  9:19   ` Marcus Folkesson
2018-02-10  9:19 ` [PATCH v2 4/7] watchdog: pnx4008: make use of timeout-secs provided " Marcus Folkesson
2018-02-10  9:19   ` Marcus Folkesson
2018-02-10  9:19   ` Marcus Folkesson
2018-02-10  9:19 ` Marcus Folkesson [this message]
2018-02-10  9:19   ` [PATCH v2 5/7] watchdog: mtk: allow setting timeout " Marcus Folkesson
2018-02-10  9:19   ` Marcus Folkesson
2018-02-10 11:10   ` Sean Wang
2018-02-10 11:10     ` Sean Wang
2018-02-10 11:10     ` Sean Wang
2018-02-10 11:10     ` Sean Wang
2018-02-10 12:43     ` Marcus Folkesson
2018-02-10 12:43       ` Marcus Folkesson
2018-02-10 12:43       ` Marcus Folkesson
2018-02-10 12:43       ` Marcus Folkesson
2018-02-10 20:12       ` Marcus Folkesson
2018-02-10 20:12         ` Marcus Folkesson
2018-02-10 20:12         ` Marcus Folkesson
2018-02-10 20:12         ` Marcus Folkesson
2018-02-11  1:52         ` Guenter Roeck
2018-02-11  1:52           ` Guenter Roeck
2018-02-11  1:52           ` Guenter Roeck
2018-02-11  1:52           ` Guenter Roeck
2018-02-11  7:46           ` Sean Wang
2018-02-11  7:46             ` Sean Wang
2018-02-11  7:46             ` Sean Wang
2018-02-11  7:46             ` Sean Wang
2018-02-11 11:17             ` Guenter Roeck
2018-02-11 11:17               ` Guenter Roeck
2018-02-11 11:17               ` Guenter Roeck
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   ` Marcus Folkesson
2018-02-10  9:19   ` Marcus Folkesson
2018-02-10  9:19 ` [PATCH v2 7/7] watchdog: coh901327: make use of timeout-secs provided " Marcus Folkesson
2018-02-10  9:19   ` Marcus Folkesson
2018-02-10  9:19   ` Marcus Folkesson
2018-02-11 17:33   ` [v2, " Guenter Roeck
2018-02-11 17:33     ` Guenter Roeck
2018-02-11 17:33     ` Guenter Roeck
2018-02-11 17:33     ` Guenter Roeck
2018-02-22 14:00   ` [PATCH v2 " Linus Walleij
2018-02-22 14:00     ` Linus Walleij
2018-02-22 14:00     ` Linus Walleij
2018-02-22 14:00     ` Linus Walleij
2018-02-10 14:29 ` [PATCH v2 1/7] watchdog: sama5d4: " Alexandre Belloni
2018-02-10 14:29   ` Alexandre Belloni
2018-02-10 14:29   ` Alexandre Belloni
2018-02-10 14:29   ` 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-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.