Merge branch 'origin' into devel

[mv-sheeva.git] / drivers / watchdog / rc32434_wdt.c

diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index 89f326a39b6be72708af83f1257625f33bef6e4d..f6cccc9df022cbb55b04aa5fac43fcfd6413964c 100644 (file)
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -28,16 +28,18 @@
 #include <linux/watchdog.h>            /* For the watchdog specific items */
 #include <linux/init.h>                        /* For __init/__exit/... */
 #include <linux/platform_device.h>     /* For platform_driver framework */
+#include <linux/spinlock.h>            /* For spin_lock/spin_unlock/... */
 #include <linux/uaccess.h>             /* For copy_to_user/put_user/... */
 
 #include <asm/mach-rc32434/integ.h>    /* For the Watchdog registers */
 
 #define PFX KBUILD_MODNAME ": "
 
-#define VERSION "0.5"
+#define VERSION "1.0"
 
 static struct {
        unsigned long inuse;
+       spinlock_t io_lock;
 } rc32434_wdt_device;
 
 static struct integ __iomem *wdt_reg;
@@ -81,7 +83,9 @@ static int rc32434_wdt_set(int new_timeout)
                return -EINVAL;
        }
        timeout = new_timeout;
+       spin_lock(&rc32434_wdt_device.io_lock);
        writel(SEC2WTCOMP(timeout), &wdt_reg->wtcompare);
+       spin_unlock(&rc32434_wdt_device.io_lock);
 
        return 0;
 }
@@ -90,6 +94,8 @@ static void rc32434_wdt_start(void)
 {
        u32 or, nand;
 
+       spin_lock(&rc32434_wdt_device.io_lock);
+
        /* zero the counter before enabling */
        writel(0, &wdt_reg->wtcount);
 
@@ -112,20 +118,26 @@ static void rc32434_wdt_start(void)
 
        SET_BITS(wdt_reg->wtc, or, nand);
 
+       spin_unlock(&rc32434_wdt_device.io_lock);
        printk(KERN_INFO PFX "Started watchdog timer.\n");
 }
 
 static void rc32434_wdt_stop(void)
 {
+       spin_lock(&rc32434_wdt_device.io_lock);
+
        /* Disable WDT */
        SET_BITS(wdt_reg->wtc, 0, 1 << RC32434_WTC_EN);
 
+       spin_unlock(&rc32434_wdt_device.io_lock);
        printk(KERN_INFO PFX "Stopped watchdog timer.\n");
 }
 
 static void rc32434_wdt_ping(void)
 {
+       spin_lock(&rc32434_wdt_device.io_lock);
        writel(0, &wdt_reg->wtcount);
+       spin_unlock(&rc32434_wdt_device.io_lock);
 }
 
 static int rc32434_wdt_open(struct inode *inode, struct file *file)
@@ -235,7 +247,7 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
        return 0;
 }
 
-static struct file_operations rc32434_wdt_fops = {
+static const struct file_operations rc32434_wdt_fops = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
        .write          = rc32434_wdt_write,
@@ -270,6 +282,11 @@ static int __devinit rc32434_wdt_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
+       spin_lock_init(&rc32434_wdt_device.io_lock);
+
+       /* Make sure the watchdog is not running */
+       rc32434_wdt_stop();
+
        /* Check that the heartbeat value is within it's range;
         * if not reset to the default */
        if (rc32434_wdt_set(timeout)) {
@@ -301,11 +318,17 @@ static int __devexit rc32434_wdt_remove(struct platform_device *pdev)
        return 0;
 }
 
+static void rc32434_wdt_shutdown(struct platform_device *pdev)
+{
+       rc32434_wdt_stop();
+}
+
 static struct platform_driver rc32434_wdt_driver = {
-       .probe  = rc32434_wdt_probe,
-       .remove = __devexit_p(rc32434_wdt_remove),
-       .driver = {
-               .name = "rc32434_wdt",
+       .probe          = rc32434_wdt_probe,
+       .remove         = __devexit_p(rc32434_wdt_remove),
+       .shutdown       = rc32434_wdt_shutdown,
+       .driver         = {
+                       .name = "rc32434_wdt",
        }
 };