diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-07 14:23:37 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-07 14:23:37 +0100 |
commit | 8f397a4b163f6ee149837f0ab0dfd4081a720010 (patch) | |
tree | dd8f34d7eb3dace62842e575b7b3a306f9b204b8 /drivers/watchdog | |
parent | ce9cbae133c84c147bc6823f07c0b55bf4012837 (diff) | |
parent | 9fd32f5a4e8d25fb8985fec86bc03f3743820f0e (diff) | |
download | barebox-8f397a4b163f6ee149837f0ab0dfd4081a720010.tar.gz barebox-8f397a4b163f6ee149837f0ab0dfd4081a720010.tar.xz |
Merge branch 'for-next/rpi'
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/bcm2835_wdt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c index d0c51ed9e9..781626fa0f 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c @@ -45,6 +45,10 @@ #define SECS_TO_WDOG_TICKS(x) ((x) << 16) +/* Largest value where SECS_TO_WDOG_TICKS doesn't overflow 20 bits + * (PM_WDOG_TIME_SET) */ +#define WDOG_SECS_MAX 15 + struct bcm2835_wd { struct watchdog wd; void __iomem *base; @@ -101,6 +105,7 @@ static int bcm2835_wd_probe(struct device_d *dev) } priv->base = IOMEM(iores->start); priv->wd.set_timeout = bcm2835_wd_set_timeout; + priv->wd.timeout_max = WDOG_SECS_MAX; priv->wd.hwdev = dev; priv->dev = dev; |