4 files changed, 63 insertions, 12 deletions

diff --git a/drivers/i2c/busses/i2c-pasemi.c b/drivers/i2c/busses/i2c-pasemi.c
index 4174101660c9..837b8c1aa02a 100644
--- a/drivers/i2c/busses/i2c-pasemi.c
+++ b/drivers/i2c/busses/i2c-pasemi.c
@@ -88,7 +88,7 @@ static void pasemi_smb_clear(struct pasemi_smbus *smbus)
         reg_write(smbus, REG_SMSTA, status);
 }
 
-static unsigned int pasemi_smb_waitready(struct pasemi_smbus *smbus)
+static int pasemi_smb_waitready(struct pasemi_smbus *smbus)
 {
         int timeout = 10;
         unsigned int status;
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c
index d242976bcfe7..19c371809d77 100644
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
@@ -92,8 +92,10 @@ static int __init via_pmu_led_init(void)
         if (dt == NULL)
                 return -ENODEV;
         model = of_get_property(dt, "model", NULL);
-        if (model == NULL)
+        if (model == NULL) {
+                of_node_put(dt);
                 return -ENODEV;
+        }
         if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 &&
             strncmp(model, "iBook", strlen("iBook")) != 0 &&
             strcmp(model, "PowerMac7,2") != 0 &&
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 24efd8ea41bb..c356146bd712 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -957,12 +957,32 @@ config PIKA_WDT
           the Warp platform.
 
 config BOOKE_WDT
-        bool "PowerPC Book-E Watchdog Timer"
+        tristate "PowerPC Book-E Watchdog Timer"
         depends on BOOKE || 4xx
         ---help---
+          Watchdog driver for PowerPC Book-E chips, such as the Freescale
+          MPC85xx SOCs and the IBM PowerPC 440.
+
           Please see Documentation/watchdog/watchdog-api.txt for
           more information.
 
+config BOOKE_WDT_DEFAULT_TIMEOUT
+        int "PowerPC Book-E Watchdog Timer Default Timeout"
+        depends on BOOKE_WDT
+        default 38 if FSL_BOOKE
+        range 0 63 if FSL_BOOKE
+        default 3 if !FSL_BOOKE
+        range 0 3 if !FSL_BOOKE
+        help
+          Select the default watchdog timer period to be used by the PowerPC
+          Book-E watchdog driver.  A watchdog "event" occurs when the bit
+          position represented by this number transitions from zero to one.
+
+          For Freescale Book-E processors, this is a number between 0 and 63.
+          For other Book-E processors, this is a number between 0 and 3.
+
+          The value can be overidden by the wdt_period command-line parameter.
+
 # PPC64 Architecture
 
 config WATCHDOG_RTAS
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index 3d49671cdf5a..d11ffb091b0d 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -4,7 +4,7 @@
  * Author: Matthew McClintock
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
  *
- * Copyright 2005, 2008 Freescale Semiconductor Inc.
+ * Copyright 2005, 2008, 2010 Freescale Semiconductor Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -33,14 +33,8 @@
  * occur, and the final time the board will reset.
  */
 
-#ifdef  CONFIG_FSL_BOOKE
-#define WDT_PERIOD_DEFAULT 38   /* Ex. wdt_period=28 bus=333Mhz,reset=~40sec */
-#else
-#define WDT_PERIOD_DEFAULT 3    /* Refer to the PPC40x and PPC4xx manuals */
-#endif                          /* for timing information */
-
 u32 booke_wdt_enabled;
-u32 booke_wdt_period = WDT_PERIOD_DEFAULT;
+u32 booke_wdt_period = CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT;
 
 #ifdef  CONFIG_FSL_BOOKE
 #define WDTP(x)         ((((x)&0x3)<<30)|(((x)&0x3c)<<15))
@@ -114,6 +108,27 @@ static void __booke_wdt_enable(void *data)
         mtspr(SPRN_TCR, val);
 }
 
+/**
+ * booke_wdt_disable - disable the watchdog on the given CPU
+ *
+ * This function is called on each CPU.  It disables the watchdog on that CPU.
+ *
+ * TCR[WRC] cannot be changed once it has been set to non-zero, but we can
+ * effectively disable the watchdog by setting its period to the maximum value.
+ */
+static void __booke_wdt_disable(void *data)
+{
+        u32 val;
+
+        val = mfspr(SPRN_TCR);
+        val &= ~(TCR_WIE | WDTP_MASK);
+        mtspr(SPRN_TCR, val);
+
+        /* clear status to make sure nothing is pending */
+        __booke_wdt_ping(NULL);
+
+}
+
 static ssize_t booke_wdt_write(struct file *file, const char __user *buf,
                                 size_t count, loff_t *ppos)
 {
@@ -193,12 +208,21 @@ static int booke_wdt_open(struct inode *inode, struct file *file)
         return nonseekable_open(inode, file);
 }
 
+static int booke_wdt_release(struct inode *inode, struct file *file)
+{
+        on_each_cpu(__booke_wdt_disable, NULL, 0);
+        booke_wdt_enabled = 0;
+
+        return 0;
+}
+
 static const struct file_operations booke_wdt_fops = {
         .owner = THIS_MODULE,
         .llseek = no_llseek,
         .write = booke_wdt_write,
         .unlocked_ioctl = booke_wdt_ioctl,
         .open = booke_wdt_open,
+        .release = booke_wdt_release,
 };
 
 static struct miscdevice booke_wdt_miscdev = {
@@ -237,4 +261,9 @@ static int __init booke_wdt_init(void)
 
         return ret;
 }
-device_initcall(booke_wdt_init);
+
+module_init(booke_wdt_init);
+module_exit(booke_wdt_exit);
+
+MODULE_DESCRIPTION("PowerPC Book-E watchdog driver");
+MODULE_LICENSE("GPL");