summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorMartyn Welch <martyn.welch@collabora.co.uk>2016-02-26 16:05:12 +0000
committerWim Van Sebroeck <wim@iguana.be>2016-03-01 15:30:16 +0100
commit0ce72f354482cfa40fb0a6619511ab94d6daa5e9 (patch)
tree3a15cc9074bbdd8fdbad72839ce5a0a655fc106d /drivers/watchdog
parent10e7ac22cdd4d211cef99afcb9371b70cb175be6 (diff)
downloadlinux-0ce72f354482cfa40fb0a6619511ab94d6daa5e9.tar.gz
linux-0ce72f354482cfa40fb0a6619511ab94d6daa5e9.tar.bz2
linux-0ce72f354482cfa40fb0a6619511ab94d6daa5e9.zip
watchdog: ziirave_wdt: Rename "trigger" reset reason "hw watchdog"
The Zodiac watchdog is implemented on a microcontoller. The reset reason currently labelled "trigger" is not to detect when the watchdog has triggered (as had been initially understood and suggested by the naming), but to inform the reader that the watchdog, which in fact has it's own hardware watchdog, has been reset because the hardware watchdog has triggered. Renaming to "hw watchdog". Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/ziirave_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c
index 0c7cb7302cf0..cbe373de3659 100644
--- a/drivers/watchdog/ziirave_wdt.c
+++ b/drivers/watchdog/ziirave_wdt.c
@@ -36,7 +36,7 @@
#define ZIIRAVE_STATE_OFF 0x1
#define ZIIRAVE_STATE_ON 0x2
-static char *ziirave_reasons[] = {"power cycle", "triggered", NULL, NULL,
+static char *ziirave_reasons[] = {"power cycle", "hw watchdog", NULL, NULL,
"host request", NULL, "illegal configuration",
"illegal instruction", "illegal trap",
"unknown"};