summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJustin Wheeler <jwheeler@datademons.com>2012-06-11 07:07:58 +0200
committerWim Van Sebroeck <wim@iguana.be>2012-07-23 12:46:38 +0200
commit3017020dc73a3ae222db2cda9b5952f0e4cf7a09 (patch)
treead5d9d307ed25df798a00adb0baa07c6b9dbe15a /drivers
parentMerge tag 'mmc-merge-for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
downloadlinux-3017020dc73a3ae222db2cda9b5952f0e4cf7a09.tar.xz
linux-3017020dc73a3ae222db2cda9b5952f0e4cf7a09.zip
watchdog: f71808e_wdt: Add support for Jetway JNF99 motherboard
The Jetway JNF99 motherboard features a F71869 SuperIO chip, but its watchdog chipset ID appears to be 1007 (as opposed to 0814). Some testing confirmed it behaves the exact same as 0814. So add this chipset ID to the module's ID list so that the Fintek watchdog driver can correctly identify and access it. Signed-off-by: Justin Wheeler <jwheeler@datademons.com> Acked-by: Giel van Schijndel <me@mortis.eu> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/f71808e_wdt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c
index c65b0a5a020c..016bd9355190 100644
--- a/drivers/watchdog/f71808e_wdt.c
+++ b/drivers/watchdog/f71808e_wdt.c
@@ -56,6 +56,7 @@
#define SIO_F71858_ID 0x0507 /* Chipset ID */
#define SIO_F71862_ID 0x0601 /* Chipset ID */
#define SIO_F71869_ID 0x0814 /* Chipset ID */
+#define SIO_F71869A_ID 0x1007 /* Chipset ID */
#define SIO_F71882_ID 0x0541 /* Chipset ID */
#define SIO_F71889_ID 0x0723 /* Chipset ID */
@@ -195,7 +196,7 @@ static inline int superio_enter(int base)
return -EBUSY;
}
- /* according to the datasheet the key must be send twice! */
+ /* according to the datasheet the key must be sent twice! */
outb(SIO_UNLOCK_KEY, base);
outb(SIO_UNLOCK_KEY, base);
@@ -756,6 +757,7 @@ static int __init f71808e_find(int sioaddr)
err = f71862fg_pin_configure(0); /* validate module parameter */
break;
case SIO_F71869_ID:
+ case SIO_F71869A_ID:
watchdog.type = f71869;
break;
case SIO_F71882_ID: