From: Guenter Roeck <linux@roeck-us.net>
To: Srinath Mannam <srinath.mannam@broadcom.com>
Cc: wim@linux-watchdog.org, ray.jui@broadcom.com,
vladimir.olovyannikov@broadcom.com, vikram.prakash@broadcom.com,
scott.branden@broadcom.com, sudeep.holla@arm.com,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [RFC PATCH v3] watchdog: sp805: Add clock-frequency property
Date: Tue, 10 Jul 2018 14:35:57 -0700 [thread overview]
Message-ID: <20180710213557.GC27827@roeck-us.net> (raw)
In-Reply-To: <1531212279-24953-1-git-send-email-srinath.mannam@broadcom.com>
On Tue, Jul 10, 2018 at 02:14:39PM +0530, Srinath Mannam wrote:
> When using ACPI node, binding clock devices are
> not available as device tree, So clock-frequency
> property given in _DSD object of ACPI device is
> used to calculate Watchdog rate.
>
> Signed-off-by: Srinath Mannam <srinath.mannam@broadcom.com>
I am ok with the patch itself. All that is missing now is a
reference to the _DSD property documentation. Is that published
somewhere or is it all wild-wild-west ?
Thanks,
Guenter
> ---
> drivers/watchdog/sp805_wdt.c | 35 +++++++++++++++++++++++++----------
> 1 file changed, 25 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
> index 9849db0..a896b1c 100644
> --- a/drivers/watchdog/sp805_wdt.c
> +++ b/drivers/watchdog/sp805_wdt.c
> @@ -11,6 +11,7 @@
> * warranty of any kind, whether express or implied.
> */
>
> +#include <linux/acpi.h>
> #include <linux/device.h>
> #include <linux/resource.h>
> #include <linux/amba/bus.h>
> @@ -22,6 +23,7 @@
> #include <linux/math64.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> +#include <linux/of.h>
> #include <linux/pm.h>
> #include <linux/slab.h>
> #include <linux/spinlock.h>
> @@ -65,6 +67,7 @@ struct sp805_wdt {
> spinlock_t lock;
> void __iomem *base;
> struct clk *clk;
> + u64 rate;
> struct amba_device *adev;
> unsigned int load_val;
> };
> @@ -80,7 +83,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)
> struct sp805_wdt *wdt = watchdog_get_drvdata(wdd);
> u64 load, rate;
>
> - rate = clk_get_rate(wdt->clk);
> + rate = wdt->rate;
>
> /*
> * sp805 runs counter with given value twice, after the end of first
> @@ -106,9 +109,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)
> static unsigned int wdt_timeleft(struct watchdog_device *wdd)
> {
> struct sp805_wdt *wdt = watchdog_get_drvdata(wdd);
> - u64 load, rate;
> -
> - rate = clk_get_rate(wdt->clk);
> + u64 load;
>
> spin_lock(&wdt->lock);
> load = readl_relaxed(wdt->base + WDTVALUE);
> @@ -118,7 +119,7 @@ static unsigned int wdt_timeleft(struct watchdog_device *wdd)
> load += wdt->load_val + 1;
> spin_unlock(&wdt->lock);
>
> - return div_u64(load, rate);
> + return div_u64(load, wdt->rate);
> }
>
> static int
> @@ -228,11 +229,25 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
> if (IS_ERR(wdt->base))
> return PTR_ERR(wdt->base);
>
> - wdt->clk = devm_clk_get(&adev->dev, NULL);
> - if (IS_ERR(wdt->clk)) {
> - dev_warn(&adev->dev, "Clock not found\n");
> - ret = PTR_ERR(wdt->clk);
> - goto err;
> + if (adev->dev.of_node) {
> + wdt->clk = devm_clk_get(&adev->dev, NULL);
> + if (IS_ERR(wdt->clk)) {
> + dev_err(&adev->dev, "Clock not found\n");
> + return PTR_ERR(wdt->clk);
> + }
> + wdt->rate = clk_get_rate(wdt->clk);
> + } else if (has_acpi_companion(&adev->dev)) {
> + /*
> + * When Driver probe with ACPI device, clock devices
> + * are not available, so watchdog rate get from
> + * clock-frequency property given in _DSD object.
> + */
> + device_property_read_u64(&adev->dev, "clock-frequency",
> + &wdt->rate);
> + if (!wdt->rate) {
> + dev_err(&adev->dev, "no clock-frequency property\n");
> + return -ENODEV;
> + }
> }
>
> wdt->adev = adev;
> --
> 2.7.4
>
next prev parent reply other threads:[~2018-07-10 21:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-10 8:44 [RFC PATCH v3] watchdog: sp805: Add clock-frequency property Srinath Mannam
2018-07-10 21:35 ` Guenter Roeck [this message]
2018-07-11 13:22 ` Srinath Mannam
2018-07-11 13:47 ` Guenter Roeck
2018-07-11 15:30 ` Sudeep Holla
2018-07-11 15:39 ` Guenter Roeck
2018-07-11 16:05 ` Sudeep Holla
2018-07-21 14:38 ` Guenter Roeck
2018-07-23 5:35 ` Srinath Mannam
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=20180710213557.GC27827@roeck-us.net \
--to=linux@roeck-us.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=ray.jui@broadcom.com \
--cc=scott.branden@broadcom.com \
--cc=srinath.mannam@broadcom.com \
--cc=sudeep.holla@arm.com \
--cc=vikram.prakash@broadcom.com \
--cc=vladimir.olovyannikov@broadcom.com \
--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).