dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-28 14:01:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

watchdog: bcm6345: callback start use tick instead of ms

Browse Source 
The function bcm6345_wdt_start use the argument timeout
as tick but it should be used as milliseconds.

A clock is added as requirement for this driver.
The frequency of the clock is then used to convert the
millisecond to ticks in the function bcm6345_wdt_start.

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Philippe Reynes
2019-05-03 19:43:06 +02:00
committed by Tom Rini
parent 3eaf6dcd93
commit c411adbdd0
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/watchdog/bcm6345_wdt.c
View File

@@ -10,6 +10,7 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <wdt.h> #include <wdt.h>
#include <clk.h>
#include <asm/io.h> #include <asm/io.h>
/* WDT Value register */ /* WDT Value register */
@@ -26,6 +27,7 @@
struct bcm6345_wdt_priv { struct bcm6345_wdt_priv {
void __iomem *regs; void __iomem *regs;
unsigned long clk_rate;
}; };
static int bcm6345_wdt_reset(struct udevice *dev) static int bcm6345_wdt_reset(struct udevice *dev)
@@ -41,16 +43,17 @@ static int bcm6345_wdt_reset(struct udevice *dev)
static int bcm6345_wdt_start(struct udevice *dev, u64 timeout, ulong flags) static int bcm6345_wdt_start(struct udevice *dev, u64 timeout, ulong flags)
{ {
struct bcm6345_wdt_priv *priv = dev_get_priv(dev); struct bcm6345_wdt_priv *priv = dev_get_priv(dev);
u32 val = priv->clk_rate / 1000 * timeout;
if (timeout < WDT_VAL_MIN) { if (val < WDT_VAL_MIN) {
debug("watchdog won't fire with less than 2 ticks\n"); debug("watchdog won't fire with less than 2 ticks\n");
timeout = WDT_VAL_MIN; val = WDT_VAL_MIN;
} else if (timeout > WDT_VAL_MAX) { } else if (val > WDT_VAL_MAX) {
debug("maximum watchdog timeout exceeded\n"); debug("maximum watchdog timeout exceeded\n");
timeout = WDT_VAL_MAX; val = WDT_VAL_MAX;
} }
writel(timeout, priv->regs + WDT_VAL_REG); writel(val, priv->regs + WDT_VAL_REG);
return bcm6345_wdt_reset(dev); return bcm6345_wdt_reset(dev);
} }
@@ -85,11 +88,19 @@ static const struct udevice_id bcm6345_wdt_ids[] = {
static int bcm6345_wdt_probe(struct udevice *dev) static int bcm6345_wdt_probe(struct udevice *dev)
{ {
struct bcm6345_wdt_priv *priv = dev_get_priv(dev); struct bcm6345_wdt_priv *priv = dev_get_priv(dev);
struct clk clk;
int ret;
priv->regs = dev_remap_addr(dev); priv->regs = dev_remap_addr(dev);
if (!priv->regs) if (!priv->regs)
return -EINVAL; return -EINVAL;
ret = clk_get_by_index(dev, 0, &clk);
if (!ret)
priv->clk_rate = clk_get_rate(&clk);
else
return -EINVAL;
bcm6345_wdt_stop(dev); bcm6345_wdt_stop(dev);
return 0; return 0;