Thread (27 messages) 27 messages, 2 authors, 2012-06-13
STALE5121d

[PATCH V2 17/22] watchdog/mpcore_wdt: use correct clk_rate to program timeout

From: Viresh Kumar <hidden>
Date: 2012-04-24 10:42:07
Also in: linux-watchdog
Subsystem: the rest, watchdog device drivers · Maintainers: Linus Torvalds, Wim Van Sebroeck, Guenter Roeck

On 3/12/2012 9:52 AM, Viresh KUMAR wrote:
Currently, mpcore wdt driver doesn't use exact clk_rate to program timeout in
hardware. This patch provides two ways of doing so:
	- either use clk_get_rate() if clk_get passes
	- use clk_rate passed via module param

Signed-off-by: Viresh Kumar <redacted>
Wim,

Will these go in v3.5?

Please squash following with this patch while applying.
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 3690af3..e7cadc0 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -370,7 +370,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *pdev)
                        TIMER_MARGIN);
        }
 
-       mpcore_wdt_set_heartbeat(NULL, mpcore_margin);
+       mpcore_wdt_set_heartbeat(&wdt->wdd, mpcore_margin);
        dev_info(wdt->dev, "MPcore Watchdog Timer: 0.1. mpcore_noboot=%d "
                        "mpcore_margin=%d sec (nowayout= %d)\n", mpcore_noboot,
                        mpcore_margin, nowayout);
-- 
viresh
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help