diff options
Diffstat (limited to 'drivers/char/watchdog/w83697hf_wdt.c')
-rw-r--r-- | drivers/char/watchdog/w83697hf_wdt.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/char/watchdog/w83697hf_wdt.c b/drivers/char/watchdog/w83697hf_wdt.c index 32710a97b161..c31121eab3c9 100644 --- a/drivers/char/watchdog/w83697hf_wdt.c +++ b/drivers/char/watchdog/w83697hf_wdt.c | |||
@@ -89,8 +89,6 @@ w83697hf_unselect_wd_register(void) | |||
89 | outb_p(0xAA, WDT_EFER); /* Leave extended function mode */ | 89 | outb_p(0xAA, WDT_EFER); /* Leave extended function mode */ |
90 | } | 90 | } |
91 | 91 | ||
92 | /* tyan motherboards seem to set F5 to 0x4C ? | ||
93 | * So explicitly init to appropriate value. */ | ||
94 | static void | 92 | static void |
95 | w83697hf_init(void) | 93 | w83697hf_init(void) |
96 | { | 94 | { |
@@ -100,15 +98,15 @@ w83697hf_init(void) | |||
100 | 98 | ||
101 | outb_p(0xF3, WDT_EFER); /* Select CRF3 */ | 99 | outb_p(0xF3, WDT_EFER); /* Select CRF3 */ |
102 | 100 | ||
103 | t=inb_p(WDT_EFDR); /* read CRF6 */ | 101 | t=inb_p(WDT_EFDR); /* read CRF3 */ |
104 | if (t != 0) { | 102 | if (t != 0) { |
105 | printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout); | 103 | printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout); |
106 | outb_p(timeout, WDT_EFDR); /* Write back to CRF6 */ | 104 | outb_p(timeout, WDT_EFDR); /* Write back to CRF3 */ |
107 | } | 105 | } |
108 | outb_p(0xF4, WDT_EFER); /* Select CRF4 */ | 106 | outb_p(0xF4, WDT_EFER); /* Select CRF4 */ |
109 | t=inb_p(WDT_EFDR); /* read CRF4 */ | 107 | t=inb_p(WDT_EFDR); /* read CRF4 */ |
110 | t&=~0x0C; /* set second mode & disable keyboard turning off watchdog */ | 108 | t&=~0x0C; /* set second mode & disable keyboard turning off watchdog */ |
111 | outb_p(t, WDT_EFDR); /* Write back to CRF5 */ | 109 | outb_p(t, WDT_EFDR); /* Write back to CRF4 */ |
112 | 110 | ||
113 | w83697hf_unselect_wd_register(); | 111 | w83697hf_unselect_wd_register(); |
114 | } | 112 | } |