From: Melin Tomas <tomas.melin@vaisala.com>
To: "linux@roeck-us.net" <linux@roeck-us.net>,
"wim@linux-watchdog.org" <wim@linux-watchdog.org>
Cc: "linux-watchdog@vger.kernel.org" <linux-watchdog@vger.kernel.org>,
Melin Tomas <tomas.melin@vaisala.com>
Subject: [PATCH v3 1/4] watchdog: cadence_wdt: Move clock detection earlier in probe
Date: Tue, 9 Jul 2019 20:09:03 +0000 [thread overview]
Message-ID: <20190709200801.42313-2-tomas.melin@vaisala.com> (raw)
In-Reply-To: <20190709200801.42313-1-tomas.melin@vaisala.com>
Timeout calculation needs clock frequency, so init clock and calculate
prescaler value earlier in the probe.
Preparational step for calculating maximum and minimum timeout values
for driver.
Signed-off-by: Tomas Melin <tomas.melin@vaisala.com>
---
drivers/watchdog/cadence_wdt.c | 50 +++++++++++++++++-----------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c
index a22f2d431a35..ddbf602bdc40 100644
--- a/drivers/watchdog/cadence_wdt.c
+++ b/drivers/watchdog/cadence_wdt.c
@@ -300,6 +300,31 @@ static int cdns_wdt_probe(struct platform_device *pdev)
if (!wdt)
return -ENOMEM;
+ wdt->clk = devm_clk_get(dev, NULL);
+ if (IS_ERR(wdt->clk)) {
+ dev_err(dev, "input clock not found\n");
+ return PTR_ERR(wdt->clk);
+ }
+
+ ret = clk_prepare_enable(wdt->clk);
+ if (ret) {
+ dev_err(dev, "unable to enable clock\n");
+ return ret;
+ }
+ ret = devm_add_action_or_reset(dev, cdns_clk_disable_unprepare,
+ wdt->clk);
+ if (ret)
+ return ret;
+
+ clock_f = clk_get_rate(wdt->clk);
+ if (clock_f <= CDNS_WDT_CLK_75MHZ) {
+ wdt->prescaler = CDNS_WDT_PRESCALE_512;
+ wdt->ctrl_clksel = CDNS_WDT_PRESCALE_SELECT_512;
+ } else {
+ wdt->prescaler = CDNS_WDT_PRESCALE_4096;
+ wdt->ctrl_clksel = CDNS_WDT_PRESCALE_SELECT_4096;
+ }
+
cdns_wdt_device = &wdt->cdns_wdt_device;
cdns_wdt_device->info = &cdns_wdt_info;
cdns_wdt_device->ops = &cdns_wdt_ops;
@@ -333,31 +358,6 @@ static int cdns_wdt_probe(struct platform_device *pdev)
watchdog_stop_on_reboot(cdns_wdt_device);
watchdog_set_drvdata(cdns_wdt_device, wdt);
- wdt->clk = devm_clk_get(dev, NULL);
- if (IS_ERR(wdt->clk)) {
- dev_err(dev, "input clock not found\n");
- return PTR_ERR(wdt->clk);
- }
-
- ret = clk_prepare_enable(wdt->clk);
- if (ret) {
- dev_err(dev, "unable to enable clock\n");
- return ret;
- }
- ret = devm_add_action_or_reset(dev, cdns_clk_disable_unprepare,
- wdt->clk);
- if (ret)
- return ret;
-
- clock_f = clk_get_rate(wdt->clk);
- if (clock_f <= CDNS_WDT_CLK_75MHZ) {
- wdt->prescaler = CDNS_WDT_PRESCALE_512;
- wdt->ctrl_clksel = CDNS_WDT_PRESCALE_SELECT_512;
- } else {
- wdt->prescaler = CDNS_WDT_PRESCALE_4096;
- wdt->ctrl_clksel = CDNS_WDT_PRESCALE_SELECT_4096;
- }
-
spin_lock_init(&wdt->io_lock);
watchdog_stop_on_reboot(cdns_wdt_device);
--
2.17.2
next prev parent reply other threads:[~2019-07-09 20:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-09 20:09 [PATCH v3 0/4] watchdog: cadence_wdt: Support all available prescaler values Melin Tomas
2019-07-09 20:09 ` Melin Tomas [this message]
2019-07-09 20:15 ` [PATCH v3 1/4] watchdog: cadence_wdt: Move clock detection earlier in probe Guenter Roeck
2019-07-09 20:09 ` [PATCH v3 2/4] watchdog: cadence_wdt: Calculate actual timeout limits Melin Tomas
2019-07-09 20:14 ` Guenter Roeck
2019-07-09 20:09 ` [PATCH v3 4/4] watchdog: cadence_wdt: Support all available prescaler values Melin Tomas
2019-07-09 20:21 ` Guenter Roeck
2019-07-09 20:49 ` Melin Tomas
2019-07-09 21:07 ` Guenter Roeck
2019-07-10 19:20 ` Melin Tomas
2019-07-10 20:39 ` Guenter Roeck
2019-07-11 20:10 ` Melin Tomas
2019-07-09 20:09 ` [PATCH v3 3/4] watchdog: cadence_wdt: Group struct member init statements Melin Tomas
2019-07-09 20:16 ` Guenter Roeck
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=20190709200801.42313-2-tomas.melin@vaisala.com \
--to=tomas.melin@vaisala.com \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@linux-watchdog.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).