Merge tag 'rproc-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...

[linux-2.6-block.git] / drivers / watchdog / bcm2835_wdt.c

diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index 7a855289ff5e677c75735e95fe435ed4b5941a20..bb001c5d7f17fd635b1a084f4a24d4c9ab01ba59 100644 (file)
--- a/drivers/watchdog/bcm2835_wdt.c
+++ b/drivers/watchdog/bcm2835_wdt.c
@@ -42,6 +42,7 @@
 
 #define SECS_TO_WDOG_TICKS(x) ((x) << 16)
 #define WDOG_TICKS_TO_SECS(x) ((x) >> 16)
+#define WDOG_TICKS_TO_MSECS(x) ((x) * 1000 >> 16)
 
 struct bcm2835_wdt {
        void __iomem            *base;
@@ -140,7 +141,7 @@ static struct watchdog_device bcm2835_wdt_wdd = {
        .info =         &bcm2835_wdt_info,
        .ops =          &bcm2835_wdt_ops,
        .min_timeout =  1,
-       .max_timeout =  WDOG_TICKS_TO_SECS(PM_WDOG_TIME_SET),
+       .max_hw_heartbeat_ms =  WDOG_TICKS_TO_MSECS(PM_WDOG_TIME_SET),
        .timeout =      WDOG_TICKS_TO_SECS(PM_WDOG_TIME_SET),
 };