Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220564
b: refs/heads/master
c: a422088
h: refs/heads/master
v: v3
  • Loading branch information
Timo Juhani Lindfors authored and Wim Van Sebroeck committed Oct 28, 2010
1 parent a8e11f1 commit c9e1e2b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f0fc10745a48c766ea5d6d83a6a371a223986bb0
refs/heads/master: a422088db21333ba02a0f4fe4f5abfb08c802d35
13 changes: 11 additions & 2 deletions trunk/drivers/watchdog/it8712f_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@ static unsigned short address;
#define WDT_OUT_PWROK 0x10 /* Pulse PWROK on timeout */
#define WDT_OUT_KRST 0x40 /* Pulse reset on timeout */

static int wdt_control_reg = WDT_RESET_GAME;
module_param(wdt_control_reg, int, 0);
MODULE_PARM_DESC(wdt_control_reg, "Value to write to watchdog control "
"register. The default WDT_RESET_GAME resets the timer on "
"game port reads that this driver generates. You can also "
"use KBD, MOUSE or CIR if you have some external way to "
"generate those interrupts.");

static int superio_inb(int reg)
{
outb(reg, REG);
Expand Down Expand Up @@ -131,7 +139,8 @@ static inline void superio_exit(void)

static inline void it8712f_wdt_ping(void)
{
inb(address);
if (wdt_control_reg & WDT_RESET_GAME)
inb(address);
}

static void it8712f_wdt_update_margin(void)
Expand Down Expand Up @@ -170,7 +179,7 @@ static void it8712f_wdt_enable(void)
superio_enter();
superio_select(LDN_GPIO);

superio_outb(WDT_RESET_GAME, WDT_CONTROL);
superio_outb(wdt_control_reg, WDT_CONTROL);

it8712f_wdt_update_margin();

Expand Down

0 comments on commit c9e1e2b

Please sign in to comment.