summaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorGiel van Schijndel <me@mortis.eu>2010-10-04 10:45:28 +0200
committerWim Van Sebroeck <wim@iguana.be>2010-10-28 21:43:35 +0000
commitdee00abbbcab97b8ee3bbafb5e786dde83e26741 (patch)
tree9bc75e24a697f278b7f8d771aed1f3dad95b7f9c /drivers/watchdog
parent29c3e8c8d16b74e91da9be445ff3e14136957753 (diff)
downloadlinux-3.10-dee00abbbcab97b8ee3bbafb5e786dde83e26741.tar.gz
linux-3.10-dee00abbbcab97b8ee3bbafb5e786dde83e26741.tar.bz2
linux-3.10-dee00abbbcab97b8ee3bbafb5e786dde83e26741.zip
watchdog: f71808e_wdt: add support for the F71889FG
Signed-off-by: Giel van Schijndel <me@mortis.eu> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/Kconfig4
-rw-r--r--drivers/watchdog/f71808e_wdt.c10
2 files changed, 11 insertions, 3 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 5a5c024482f..57b8a410697 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -409,11 +409,11 @@ config ALIM7101_WDT
Most people will say N.
config F71808E_WDT
- tristate "Fintek F71808E and F71882FG Watchdog"
+ tristate "Fintek F71808E, F71882FG and F71889FG Watchdog"
depends on X86 && EXPERIMENTAL
help
This is the driver for the hardware watchdog on the Fintek
- F71808E and F71882FG Super I/O controllers.
+ F71808E, F71882FG and F71889FG Super I/O controllers.
You can compile this driver directly into the kernel, or use
it as a module. The module will be called f71808e_wdt.
diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c
index 7e5c266cda4..65e579635db 100644
--- a/drivers/watchdog/f71808e_wdt.c
+++ b/drivers/watchdog/f71808e_wdt.c
@@ -308,6 +308,12 @@ static int watchdog_start(void)
superio_set_bit(watchdog.sioaddr, 0x29, 1);
break;
+ case f71889fg:
+ /* set pin 40 to WDTRST# */
+ superio_outb(watchdog.sioaddr, 0x2b,
+ superio_inb(watchdog.sioaddr, 0x2b) & 0xcf);
+ break;
+
default:
/*
* 'default' label to shut up the compiler and catch
@@ -708,8 +714,10 @@ static int __init f71808e_find(int sioaddr)
case SIO_F71882_ID:
watchdog.type = f71882fg;
break;
- case SIO_F71862_ID:
case SIO_F71889_ID:
+ watchdog.type = f71889fg;
+ break;
+ case SIO_F71862_ID:
/* These have a watchdog, though it isn't implemented (yet). */
err = -ENOSYS;
goto exit;