[PATCH v5 3/8] watchdog: orion_wdt: add timeout-sec property binding
From: Fabio Porcedda <hidden>
Date: 2012-11-19 14:10:38
Also in:
linux-arm-kernel, linux-watchdog
Subsystem:
open firmware and flattened device tree bindings, the rest, watchdog device drivers · Maintainers:
Rob Herring, Krzysztof Kozlowski, Conor Dooley, Linus Torvalds, Wim Van Sebroeck, Guenter Roeck
Possibly related (same subject, not in this thread)
- 2012-11-20 · Re: [PATCH v5 3/8] watchdog: orion_wdt: add timeout-sec property binding · Jason Cooper <hidden>
- 2012-11-20 · Re: [PATCH v5 3/8] watchdog: orion_wdt: add timeout-sec property binding · Fabio Porcedda <hidden>
- 2012-11-20 · Re: [PATCH v5 3/8] watchdog: orion_wdt: add timeout-sec property binding · Fabio Porcedda <hidden>
- 2012-11-19 · Re: [PATCH v5 3/8] watchdog: orion_wdt: add timeout-sec property binding · Jason Cooper <hidden>
Only compile tested. Signed-off-by: Fabio Porcedda <redacted> Cc: Jason Cooper <redacted> Cc: Andrew Lunn <redacted> --- Documentation/devicetree/bindings/watchdog/marvel.txt | 5 +++++ drivers/watchdog/orion_wdt.c | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/watchdog/marvel.txt b/Documentation/devicetree/bindings/watchdog/marvel.txt
index 0b2503a..5dc8d30 100644
--- a/Documentation/devicetree/bindings/watchdog/marvel.txt
+++ b/Documentation/devicetree/bindings/watchdog/marvel.txt@@ -5,10 +5,15 @@ Required Properties: - Compatibility : "marvell,orion-wdt" - reg : Address of the timer registers +Optional properties: + +- timeout-sec : Contains the watchdog timeout in seconds + Example: wdt@20300 { compatible = "marvell,orion-wdt"; reg = <0x20300 0x28>; + timeout-sec = <10>; status = "okay"; };
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index c20f96b..446a3e9 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c@@ -162,12 +162,10 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev) wdt_max_duration = WDT_MAX_CYCLE_COUNT / wdt_tclk; - if ((heartbeat < 1) || (heartbeat > wdt_max_duration)) - heartbeat = wdt_max_duration; - - orion_wdt.timeout = heartbeat; orion_wdt.min_timeout = 1; + orion_wdt.timeout = wdt_max_duration; orion_wdt.max_timeout = wdt_max_duration; + watchdog_init_timeout(&orion_wdt, heartbeat, pdev->dev.of_node); watchdog_set_nowayout(&orion_wdt, nowayout); ret = watchdog_register_device(&orion_wdt);
@@ -177,7 +175,7 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev) } pr_info("Initial timeout %d sec%s\n", - heartbeat, nowayout ? ", nowayout" : ""); + orion_wdt.timeout, nowayout ? ", nowayout" : ""); return 0; }
--
1.8.0