watchdog: add timeout-sec property binding

this patchset add the timeout-sec property to the following drivers:
orion_wdt, pnx4008_wdt, s3c2410_wdt and at91sam9_wdt.

The at91sam9_wdt is tested on evk-pr3,
the other drivers are compile tested only.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Masanari Iida <standby24x7@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 87ed2b9886a3..da577980d390 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -140,6 +140,7 @@ static const struct watchdog_ops orion_wdt_ops = {
 static struct watchdog_device orion_wdt = {
         .info = &orion_wdt_info,
         .ops = &orion_wdt_ops,
+        .min_timeout = 1,
 };
 
 static int orion_wdt_probe(struct platform_device *pdev)
@@ -164,12 +165,9 @@ static int 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);
 
         watchdog_set_nowayout(&orion_wdt, nowayout);
         ret = watchdog_register_device(&orion_wdt);
@@ -179,7 +177,7 @@ static int 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;
 }