GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-07-03 04:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

watchdog: cadence: Remove driver specific "timeout-sec" handling

Browse source 
Now that we have a generic DT property "timeout-sec" handling, the
driver specific implementation can be dropped.

This patch also changes the timeout restriction to the min and max
values (clipping). Before this patch, the value provided via
"timeout-sec" was used if the parameter was too high or low. Now
the driver specific min and max values are used instead.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Michal Simek <michal.simek@xilinx.com> (on zcu100)
This commit is contained in:
Stefan Roese 2019-04-11 15:58:45 +02:00
parent 06985289d4
commit 782ef57edc
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/watchdog/cdns_wdt.c
View file

@ -10,6 +10,7 @@
#include <dm.h> #include <dm.h>
#include <wdt.h> #include <wdt.h>
#include <clk.h> #include <clk.h>
#include <div64.h>
#include <linux/io.h> #include <linux/io.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -23,7 +24,6 @@ struct cdns_regs {
struct cdns_wdt_priv { struct cdns_wdt_priv {
bool rst; bool rst;
u32 timeout;
struct cdns_regs *regs; struct cdns_regs *regs;
}; };
@ -142,10 +142,10 @@ static int cdns_wdt_start(struct udevice *dev, u64 timeout, ulong flags)
return -1; return -1;
} }
if ((timeout < CDNS_WDT_MIN_TIMEOUT) || /* Calculate timeout in seconds and restrict to min and max value */
(timeout > CDNS_WDT_MAX_TIMEOUT)) { do_div(timeout, 1000);
timeout = priv->timeout; timeout = max_t(u64, timeout, CDNS_WDT_MIN_TIMEOUT);
} timeout = min_t(u64, timeout, CDNS_WDT_MAX_TIMEOUT);
debug("%s: CLK_FREQ %ld, timeout %lld\n", __func__, clk_f, timeout); debug("%s: CLK_FREQ %ld, timeout %lld\n", __func__, clk_f, timeout);
@ -235,12 +235,9 @@ static int cdns_wdt_ofdata_to_platdata(struct udevice *dev)
if (IS_ERR(priv->regs)) if (IS_ERR(priv->regs))
return PTR_ERR(priv->regs); return PTR_ERR(priv->regs);
priv->timeout = dev_read_u32_default(dev, "timeout-sec",
CDNS_WDT_DEFAULT_TIMEOUT);
priv->rst = dev_read_bool(dev, "reset-on-timeout"); priv->rst = dev_read_bool(dev, "reset-on-timeout");
debug("%s: timeout %d, reset %d\n", __func__, priv->timeout, priv->rst); debug("%s: reset %d\n", __func__, priv->rst);
return 0; return 0;
} }