Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[deliverable/linux.git] / drivers / watchdog / omap_wdt.h

diff --git a/drivers/watchdog/omap_wdt.h b/drivers/watchdog/omap_wdt.h
index fc02ec6a03869a6a6bb0daa9889b1ebf10d558ec..42f31ec5e90d0e0a3ff65034a322532635f12d12 100644 (file)
--- a/drivers/watchdog/omap_wdt.h
+++ b/drivers/watchdog/omap_wdt.h
@@ -44,11 +44,12 @@
  * months before firing.  These limits work without scaling,
  * with the 60 second default assumed by most tools and docs.
  */
-#define TIMER_MARGIN_MAX       (24 * 60 * 60)  /* 1 day */
+#define TIMER_MARGIN_MAX       (24 * 60 * 60)  /* 1 day */
 #define TIMER_MARGIN_DEFAULT   60      /* 60 secs */
 #define TIMER_MARGIN_MIN       1
 
 #define PTV                    0       /* prescale */
 #define GET_WLDR_VAL(secs)     (0xffffffff - ((secs) * (32768/(1<<PTV))) + 1)
+#define GET_WCCR_SECS(val)     ((0xffffffff - (val) + 1) / (32768/(1<<PTV)))
 
 #endif                         /* _OMAP_WATCHDOG_H */