Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[pandora-kernel.git] / drivers / char / watchdog / w83697hf_wdt.c

diff --git a/drivers/char/watchdog/w83697hf_wdt.c b/drivers/char/watchdog/w83697hf_wdt.c
index 4e0bd4e..d9e821d 100644 (file)
--- a/drivers/char/watchdog/w83697hf_wdt.c
+++ b/drivers/char/watchdog/w83697hf_wdt.c
@@ -1,6 +1,7 @@
 /*
  *     w83697hf/hg WDT driver
  *
+ *     (c) Copyright 2006 Samuel Tardieu <sam@rfc1149.net>
  *     (c) Copyright 2006 Marcus Junker <junker@anduras.de>
  *
  *     Based on w83627hf_wdt.c which is based on advantechwdt.c
@@ -59,7 +60,7 @@ MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=255, defau
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 
 /*
  *     Kernel methods.
@@ -83,8 +84,8 @@ w83697hf_lock(void)
 }
 
 /*
- *     The two functions w83697hf_get_reg() and w83697hf_set_reg()
- *     must be called with the device unlocked.
+ *     The three functions w83697hf_get_reg(), w83697hf_set_reg() and
+ *     w83697hf_write_timeout() must be called with the device unlocked.
  */
 
 static unsigned char
@@ -102,18 +103,20 @@ w83697hf_set_reg(unsigned char reg, unsigned char data)
 }
 
 static void
-w83697hf_select_wd_register(void)
+w83697hf_write_timeout(int timeout)
 {
-       w83697hf_unlock();
-
-       w83697hf_set_reg(0x29, 0x20);   /* Set pin 119 to WDTO# mode (= CR29, WDT0) */
+       w83697hf_set_reg(0xF4, timeout);        /* Write Timeout counter to CRF4 */
+}
 
+static void
+w83697hf_select_wdt(void)
+{
+       w83697hf_unlock();
        w83697hf_set_reg(0x07, 0x08);   /* Switch to logic device 8 (GPIO2) */
-       w83697hf_set_reg(0x30, 0x01);   /* Enable timer/activate GPIO2 via bit 0 */
 }
 
-static void
-w83697hf_unselect_wd_register(void)
+static inline void
+w83697hf_deselect_wdt(void)
 {
        w83697hf_lock();
 }
@@ -121,47 +124,60 @@ w83697hf_unselect_wd_register(void)
 static void
 w83697hf_init(void)
 {
-       unsigned char t;
+       unsigned char bbuf;
 
-       w83697hf_select_wd_register();
+       w83697hf_select_wdt();
 
-       t = w83697hf_get_reg(0xF3);     /* Read CRF3 */
-       if (t != 0) {
-               printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout);
-               w83697hf_set_reg(0xF3, timeout);        /* Write new timeout */
-       }
-       t = w83697hf_get_reg(0xF4);     /* Read CRF4 */
-       t&=~0x0C;                       /* set second mode & disable keyboard turning off watchdog */
-       w83697hf_set_reg(0xF4, t);      /* Write back to CRF4 */
+       bbuf = w83697hf_get_reg(0x29);
+       bbuf &= ~0x60;
+       bbuf |= 0x20;
+       w83697hf_set_reg(0x29, bbuf);   /* Set pin 119 to WDTO# mode (= CR29, WDT0) */
 
-       w83697hf_unselect_wd_register();
+       bbuf = w83697hf_get_reg(0xF3);
+       bbuf &= ~0x04;
+       w83697hf_set_reg(0xF3, bbuf);   /* Count mode is seconds */
+
+       w83697hf_deselect_wdt();
 }
 
-static void
-wdt_ctrl(int timeout)
+static int
+wdt_ping(void)
 {
        spin_lock(&io_lock);
+       w83697hf_select_wdt();
 
-       w83697hf_select_wd_register();
-
-       w83697hf_set_reg(0xF4, timeout);        /* Write Timeout counter to CRF4 */
-
-       w83697hf_unselect_wd_register();
+       w83697hf_write_timeout(timeout);
 
+       w83697hf_deselect_wdt();
        spin_unlock(&io_lock);
+       return 0;
 }
 
 static int
-wdt_ping(void)
+wdt_enable(void)
 {
-       wdt_ctrl(timeout);
+       spin_lock(&io_lock);
+       w83697hf_select_wdt();
+
+       w83697hf_write_timeout(timeout);
+       w83697hf_set_reg(0x30, 1);      /* Enable timer */
+
+       w83697hf_deselect_wdt();
+       spin_unlock(&io_lock);
        return 0;
 }
 
 static int
 wdt_disable(void)
 {
-       wdt_ctrl(0);
+       spin_lock(&io_lock);
+       w83697hf_select_wdt();
+
+       w83697hf_set_reg(0x30, 0);      /* Disable timer */
+       w83697hf_write_timeout(0);
+
+       w83697hf_deselect_wdt();
+       spin_unlock(&io_lock);
        return 0;
 }
 
@@ -248,7 +264,7 @@ wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                }
 
                if (options & WDIOS_ENABLECARD) {
-                       wdt_ping();
+                       wdt_enable();
                        retval = 0;
                }
 
@@ -270,7 +286,7 @@ wdt_open(struct inode *inode, struct file *file)
         *      Activate
         */
 
-       wdt_ping();
+       wdt_enable();
        return nonseekable_open(inode, file);
 }
 
@@ -307,7 +323,7 @@ wdt_notify_sys(struct notifier_block *this, unsigned long code,
  *     Kernel Interfaces
  */
 
-static struct file_operations wdt_fops = {
+static const struct file_operations wdt_fops = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
        .write          = wdt_write,
@@ -353,33 +369,37 @@ w83697hf_check_wdt(void)
        return -EIO;
 }
 
+static int w83697hf_ioports[] = { 0x2e, 0x4e, 0x00 };
+
 static int __init
 wdt_init(void)
 {
-       int ret, autodetect;
+       int ret, i, found = 0;
 
        spin_lock_init(&io_lock);
 
        printk (KERN_INFO PFX "WDT driver for W83697HF/HG initializing\n");
 
-       autodetect = wdt_io == 0;
-       if (autodetect)
-               wdt_io = 0x2e;
-
-       if (!w83697hf_check_wdt())
-               goto found;
-
-       if (autodetect) {
-               wdt_io = 0x4e;
+       if (wdt_io == 0) {
+               /* we will autodetect the W83697HF/HG watchdog */
+               for (i = 0; ((!found) && (w83697hf_ioports[i] != 0)); i++) {
+                       wdt_io = w83697hf_ioports[i];
+                       if (!w83697hf_check_wdt())
+                               found++;
+               }
+       } else {
                if (!w83697hf_check_wdt())
-                       goto found;
+                       found++;
        }
 
-       printk (KERN_ERR PFX "No W83697HF/HG could be found\n");
-       ret = -EIO;
-       goto out;
+       if (!found) {
+               printk (KERN_ERR PFX "No W83697HF/HG could be found\n");
+               ret = -EIO;
+               goto out;
+       }
 
-found:
+       w83697hf_init();
+       wdt_disable();  /* Disable watchdog until first use */
 
        if (wdt_set_heartbeat(timeout)) {
                wdt_set_heartbeat(WATCHDOG_TIMEOUT);
@@ -387,8 +407,6 @@ found:
                        WATCHDOG_TIMEOUT);
        }
 
-       w83697hf_init();
-
        ret = register_reboot_notifier(&wdt_notifier);
        if (ret != 0) {
                printk (KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",
@@ -427,6 +445,6 @@ module_init(wdt_init);
 module_exit(wdt_exit);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Marcus Junker <junker@anduras.de>");
+MODULE_AUTHOR("Marcus Junker <junker@anduras.de>, Samuel Tardieu <sam@rfc1149.net>");
 MODULE_DESCRIPTION("w83697hf/hg WDT driver");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);