mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

watchdog: it87_wdt: Add support for IT8720F watchdog

Browse source 
This simple patch adds support for a watchdog in IT8720F Super IO chip
to it87_wdt driver.

Signed-off-by: Ondrej Zajicek <santiago@crfreenet.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Ondrej Zajicek 2010-09-14 02:47:28 +02:00 committed by Wim Van Sebroeck
parent a2b89cd85e
commit ee3e96583e
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/watchdog/Kconfig
View file

@ -565,10 +565,11 @@ config IT87_WDT
tristate "IT87 Watchdog Timer" tristate "IT87 Watchdog Timer"
depends on X86 && EXPERIMENTAL depends on X86 && EXPERIMENTAL
---help--- ---help---
This is the driver for the hardware watchdog on the ITE IT8716, This is the driver for the hardware watchdog on the ITE
IT8718, IT8726, IT8712(Version J,K) Super I/O chips. This watchdog IT8716, IT8718, IT8720, IT8726, IT8712(Version J,K) Super I/O
simply watches your kernel to make sure it doesn't freeze, and if chips. This watchdog simply watches your kernel to make sure
it does, it reboots your computer after a certain amount of time. it doesn't freeze, and if it does, it reboots your computer
after a certain amount of time.
To compile this driver as a module, choose M here: the module will To compile this driver as a module, choose M here: the module will
be called it87_wdt. be called it87_wdt.

17
drivers/watchdog/it87_wdt.c
View file

@ -12,7 +12,7 @@
* http://www.ite.com.tw/ * http://www.ite.com.tw/
* *
* Support of the watchdog timers, which are available on * Support of the watchdog timers, which are available on
* IT8716, IT8718, IT8726 and IT8712 (J,K version). * IT8716, IT8718, IT8720, IT8726 and IT8712 (J,K version).
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -45,7 +45,7 @@
#include <asm/system.h> #include <asm/system.h>
#define WATCHDOG_VERSION "1.12" #define WATCHDOG_VERSION "1.13"
#define WATCHDOG_NAME "IT87 WDT" #define WATCHDOG_NAME "IT87 WDT"
#define PFX WATCHDOG_NAME ": " #define PFX WATCHDOG_NAME ": "
#define DRIVER_VERSION WATCHDOG_NAME " driver, v" WATCHDOG_VERSION "\n" #define DRIVER_VERSION WATCHDOG_NAME " driver, v" WATCHDOG_VERSION "\n"
@ -80,6 +80,7 @@
#define IT8712_ID 0x8712 #define IT8712_ID 0x8712
#define IT8716_ID 0x8716 #define IT8716_ID 0x8716
#define IT8718_ID 0x8718 #define IT8718_ID 0x8718
#define IT8720_ID 0x8720
#define IT8726_ID 0x8726 /* the data sheet suggest wrongly 0x8716 */ #define IT8726_ID 0x8726 /* the data sheet suggest wrongly 0x8716 */
/* GPIO Configuration Registers LDN=0x07 */ /* GPIO Configuration Registers LDN=0x07 */
@ -92,7 +93,7 @@
#define WDT_CIRINT 0x80 #define WDT_CIRINT 0x80
#define WDT_MOUSEINT 0x40 #define WDT_MOUSEINT 0x40
#define WDT_KYBINT 0x20 #define WDT_KYBINT 0x20
#define WDT_GAMEPORT 0x10 /* not it8718 */ #define WDT_GAMEPORT 0x10 /* not in it8718, it8720 */
#define WDT_FORCE 0x02 #define WDT_FORCE 0x02
#define WDT_ZERO 0x01 #define WDT_ZERO 0x01
@ -529,6 +530,7 @@ static struct notifier_block wdt_notifier = {
static int __init it87_wdt_init(void) static int __init it87_wdt_init(void)
{ {
int rc = 0; int rc = 0;
int try_gameport = !nogameport;
u16 chip_type; u16 chip_type;
u8 chip_rev; u8 chip_rev;
unsigned long flags; unsigned long flags;
@ -542,9 +544,12 @@ static int __init it87_wdt_init(void)
switch (chip_type) { switch (chip_type) {
case IT8716_ID: case IT8716_ID:
case IT8718_ID:
case IT8726_ID: case IT8726_ID:
break; break;
case IT8718_ID:
case IT8720_ID:
try_gameport = 0;
break;
case IT8712_ID: case IT8712_ID:
if (chip_rev > 7) if (chip_rev > 7)
break; break;
@ -571,7 +576,7 @@ static int __init it87_wdt_init(void)
superio_outb(0x00, WDTCTRL); superio_outb(0x00, WDTCTRL);
/* First try to get Gameport support */ /* First try to get Gameport support */
if (chip_type != IT8718_ID && !nogameport) { if (try_gameport) {
superio_select(GAMEPORT); superio_select(GAMEPORT);
base = superio_inw(BASEREG); base = superio_inw(BASEREG);
if (!base) { if (!base) {
@ -676,7 +681,7 @@ static int __init it87_wdt_init(void)
spin_unlock_irqrestore(&spinlock, flags); spin_unlock_irqrestore(&spinlock, flags);
} }
err_out: err_out:
if (chip_type != IT8718_ID && !nogameport) { if (try_gameport) {
spin_lock_irqsave(&spinlock, flags); spin_lock_irqsave(&spinlock, flags);
superio_enter(); superio_enter();
superio_select(GAMEPORT); superio_select(GAMEPORT);