diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2015-04-27 12:22:59 +0300 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2015-06-22 16:54:04 +0300 |
| commit | a4f741e3e157c3a5c8aea5f2ea62b692fbf17338 (patch) | |
| tree | cacaeb4946388a9c55a0b50542f7cffc5267c565 | |
| parent | 83efa1cbcff406f0305d4b227d356d6bdce8cb13 (diff) | |
| download | linux-a4f741e3e157c3a5c8aea5f2ea62b692fbf17338.tar.xz | |
watchdog: omap: use watchdog_init_timeout instead of open coding it
Instead of (partly) open coding watchdog_init_timeout to determine the
inital timeout use the core function that exists for exactly this
purpose.
As a side effect the "timeout-sec" device-tree property is recognized now
(though currently unused in the omap device trees).
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -rw-r--r-- | Documentation/devicetree/bindings/watchdog/omap-wdt.txt | 3 | ||||
| -rw-r--r-- | drivers/watchdog/omap_wdt.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/omap-wdt.txt b/Documentation/devicetree/bindings/watchdog/omap-wdt.txt index 597e19d18dca..1fa20e453a2d 100644 --- a/Documentation/devicetree/bindings/watchdog/omap-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/omap-wdt.txt @@ -4,6 +4,9 @@ Required properties: - compatible : "ti,omap3-wdt" for OMAP3 or "ti,omap4-wdt" for OMAP4 - ti,hwmods : Name of the hwmod associated to the WDT +Optional properties: +- timeout-sec : default watchdog timeout in seconds + Examples: wdt2: wdt@4a314000 { diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 1e6be9e40577..88ca2ea88695 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c @@ -234,10 +234,7 @@ static int omap_wdt_probe(struct platform_device *pdev) omap_wdt->min_timeout = TIMER_MARGIN_MIN; omap_wdt->max_timeout = TIMER_MARGIN_MAX; - if (timer_margin >= TIMER_MARGIN_MIN && - timer_margin <= TIMER_MARGIN_MAX) - omap_wdt->timeout = timer_margin; - else + if (watchdog_init_timeout(omap_wdt, timer_margin, &pdev->dev) < 0) omap_wdt->timeout = TIMER_MARGIN_DEFAULT; watchdog_set_drvdata(omap_wdt, wdev); |