summaryrefslogtreecommitdiffstats
path: root/Documentation/watchdog
diff options
context:
space:
mode:
authorHui Chun Ong <hui.chun.ong@ni.com>2016-12-28 15:51:40 +0800
committerGuenter Roeck <linux@roeck-us.net>2017-02-24 14:00:23 -0800
commit98078ca34a0a71d012e88d6d0a7de18d11c44f96 (patch)
tree4938567aef5b1a9d365bc0e5c208452dcb371fb5 /Documentation/watchdog
parent6c368932f0d885e54b8af06d699b6d559e86f0cd (diff)
downloadlinux-stable-98078ca34a0a71d012e88d6d0a7de18d11c44f96.tar.gz
linux-stable-98078ca34a0a71d012e88d6d0a7de18d11c44f96.tar.bz2
linux-stable-98078ca34a0a71d012e88d6d0a7de18d11c44f96.zip
watchdog: nic7018_wdt: Add NIC7018 watchdog driver
Add support for the watchdog timer on PXI Embedded Controller. Signed-off-by: Hui Chun Ong <hui.chun.ong@ni.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'Documentation/watchdog')
-rw-r--r--Documentation/watchdog/watchdog-parameters.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt
index e21850e270a0..4f7d86dd0a5d 100644
--- a/Documentation/watchdog/watchdog-parameters.txt
+++ b/Documentation/watchdog/watchdog-parameters.txt
@@ -209,6 +209,11 @@ timeout: Initial watchdog timeout in seconds (0<timeout<516, default=60)
nowayout: Watchdog cannot be stopped once started
(default=kernel config parameter)
-------------------------------------------------
+nic7018_wdt:
+timeout: Initial watchdog timeout in seconds (0<timeout<464, default=80)
+nowayout: Watchdog cannot be stopped once started
+ (default=kernel config parameter)
+-------------------------------------------------
nuc900_wdt:
heartbeat: Watchdog heartbeats in seconds.
(default = 15)