From: viresh.kumar@st.com (Viresh Kumar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 17/22] watchdog/mpcore_wdt: use correct clk_rate to program timeout
Date: Tue, 24 Apr 2012 16:12:07 +0530 [thread overview]
Message-ID: <4F96837F.8030702@st.com> (raw)
In-Reply-To: <4d69b903be5a62ee88aa1017d5dcbf94bbe0dc8e.1331524811.git.viresh.kumar@st.com>
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 <viresh.kumar@st.com>
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
next prev parent reply other threads:[~2012-04-24 10:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-12 4:21 [PATCH V2 00/22] watchdog: ARM watchdogs: sp805 & mpcore updates & fixes Viresh Kumar
2012-03-12 4:21 ` [PATCH V2 01/22] watchdog: Add is_wdt_active() routine Viresh Kumar
2012-03-12 4:21 ` [PATCH V2 02/22] watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core Viresh Kumar
2012-03-12 4:21 ` [PATCH V2 03/22] watchdog/mpcore_wdt: Rename dev to pdev for pointing to struct platform_device Viresh Kumar
2012-03-12 4:21 ` [PATCH V2 04/22] watchdog/mpcore_wdt: Use devm routines Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 05/22] watchdog/mpcore_wdt: Allow platform_get_irq() to fail Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 06/22] watchdog/mpcore_wdt: convert to watchdog core Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 07/22] watchdog/mpcore_wdt: Fix multiline comments Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 08/22] watchdog/mpcore_wdt: Arrange #includes in alphabetical order Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 09/22] watchdog/mpcore_wdt: Set default heartbeat in probe instead of init Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 10/22] watchdog/mpcore_wdt: Use dev_(crit, err, info) instead of dev_printk Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 11/22] watchdog/mpcore_wdt: convert to use module_platform_driver() Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 12/22] watchdog/mpcore_wdt: Add support for dev_pm_ops interface Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 13/22] watchdog/mpcore_wdt: disable wdt in suspend only if it is busy Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 14/22] watchdog/mpcore_wdt: replace (__raw_)readl/writel with lighter *_relaxed variants Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 15/22] watchdog/mpcore_wdt: Add support for WDIOC_GETBOOTSTATUS IOCTL Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 16/22] watchdog/mpcore_wdt: Add clock framework support Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 17/22] watchdog/mpcore_wdt: use correct clk_rate to program timeout Viresh Kumar
2012-04-24 10:42 ` Viresh Kumar [this message]
2012-03-12 4:22 ` [PATCH V2 18/22] watchdog/sp805: Fix documentation style comment Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 19/22] watchdog/sp805: replace readl/writel with lighter _relaxed variants Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 20/22] watchdog/sp805: Use devm routines Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 21/22] watchdog/sp805: convert to watchdog core Viresh Kumar
2012-03-12 4:22 ` [PATCH V2 22/22] watchdog/sp805: Add clk_{un}prepare support Viresh Kumar
2012-04-10 9:35 ` [PATCH V2 00/22] watchdog: ARM watchdogs: sp805 & mpcore updates & fixes Viresh Kumar
2012-04-18 5:08 ` Viresh Kumar
2012-06-13 9:06 ` viresh kumar
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=4F96837F.8030702@st.com \
--to=viresh.kumar@st.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).