mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] watchdog: bcm2835: set timeout_max.
@ 2019-02-14 13:36 Tomaz Solc
  2019-02-18  8:48 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Tomaz Solc @ 2019-02-14 13:36 UTC (permalink / raw)
  To: barebox; +Cc: Tomaz Solc

BCM2835 watchdog timeout can be set to maximum 15 seconds (0xffffff >> 16).
---
 drivers/watchdog/bcm2835_wdt.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index d0c51ed9e..781626fa0 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;
 
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] watchdog: bcm2835: set timeout_max.
  2019-02-14 13:36 [PATCH] watchdog: bcm2835: set timeout_max Tomaz Solc
@ 2019-02-18  8:48 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2019-02-18  8:48 UTC (permalink / raw)
  To: Tomaz Solc; +Cc: barebox

On Thu, Feb 14, 2019 at 02:36:34PM +0100, Tomaz Solc wrote:
> BCM2835 watchdog timeout can be set to maximum 15 seconds (0xffffff >> 16).
> ---
>  drivers/watchdog/bcm2835_wdt.c | 5 +++++
>  1 file changed, 5 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
> index d0c51ed9e..781626fa0 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;
>  
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-02-18  8:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-14 13:36 [PATCH] watchdog: bcm2835: set timeout_max Tomaz Solc
2019-02-18  8:48 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox