mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-22 00:40:03 +00:00
Code Issues Releases Wiki Activity

watchdog: sp805: Add clock-frequency property

Browse source 
Use clock-frequency property given in _DSD object
of ACPI device to calculate Watchdog rate as binding
clock devices are not available as device tree.

Note: There is no formal review process for _DSD
properties

Signed-off-by: Srinath Mannam <srinath.mannam@broadcom.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Ray Jui <ray.jui@broadcom.com>
Reviewed-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Srinath Mannam 2018-07-26 10:28:42 +05:30 committed by Wim Van Sebroeck
parent 81ceed41d0
commit dc0e4a3bb7
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/watchdog/sp805_wdt.c
View file

@ -11,6 +11,7 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <linux/acpi.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/resource.h> #include <linux/resource.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
@ -22,6 +23,7 @@
#include <linux/math64.h> #include <linux/math64.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/of.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
@ -66,6 +68,7 @@ struct sp805_wdt {
spinlock_t lock; spinlock_t lock;
void __iomem *base; void __iomem *base;
struct clk *clk; struct clk *clk;
u64 rate;
struct amba_device *adev; struct amba_device *adev;
unsigned int load_val; unsigned int load_val;
}; };
@ -90,7 +93,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)
struct sp805_wdt *wdt = watchdog_get_drvdata(wdd); struct sp805_wdt *wdt = watchdog_get_drvdata(wdd);
u64 load, rate; u64 load, rate;
rate = clk_get_rate(wdt->clk); rate = wdt->rate;
/* /*
* sp805 runs counter with given value twice, after the end of first * sp805 runs counter with given value twice, after the end of first
@ -116,9 +119,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)
static unsigned int wdt_timeleft(struct watchdog_device *wdd) static unsigned int wdt_timeleft(struct watchdog_device *wdd)
{ {
struct sp805_wdt *wdt = watchdog_get_drvdata(wdd); struct sp805_wdt *wdt = watchdog_get_drvdata(wdd);
u64 load, rate; u64 load;
rate = clk_get_rate(wdt->clk);
spin_lock(&wdt->lock); spin_lock(&wdt->lock);
load = readl_relaxed(wdt->base + WDTVALUE); load = readl_relaxed(wdt->base + WDTVALUE);
@ -128,7 +129,7 @@ static unsigned int wdt_timeleft(struct watchdog_device *wdd)
load += wdt->load_val + 1; load += wdt->load_val + 1;
spin_unlock(&wdt->lock); spin_unlock(&wdt->lock);
return div_u64(load, rate); return div_u64(load, wdt->rate);
} }
static int static int
@ -238,11 +239,25 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
if (IS_ERR(wdt->base)) if (IS_ERR(wdt->base))
return PTR_ERR(wdt->base); return PTR_ERR(wdt->base);
wdt->clk = devm_clk_get(&adev->dev, NULL); if (adev->dev.of_node) {
if (IS_ERR(wdt->clk)) { wdt->clk = devm_clk_get(&adev->dev, NULL);
dev_warn(&adev->dev, "Clock not found\n"); if (IS_ERR(wdt->clk)) {
ret = PTR_ERR(wdt->clk); dev_err(&adev->dev, "Clock not found\n");
goto err; 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; wdt->adev = adev;