added ar7_wdt fix by Alex

[openwrt.git] / target / linux / ar7 / files / drivers / char / watchdog / ar7_wdt.c

diff --git a/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c b/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c
index 04c2e2e..8893061 100644 (file)
--- a/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c
+++ b/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c
@@ -55,11 +55,14 @@ static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
 MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close");
 
+#define READ_REG(x) readl((void __iomem*)&(x))
+#define WRITE_REG(x,v) writel((v), (void __iomem*)&(x))
+
 struct ar7_wdt {
        u32 kick_lock;
        u32 kick;
        u32 change_lock;
-       u32 change ;
+       u32 change;
        u32 disable_lock;
        u32 disable;
        u32 prescale_lock;
@@ -93,11 +96,11 @@ static void ar7_wdt_get_regs(void)
 
 static void ar7_wdt_kick(u32 value)
 {
-       ar7_wdt->kick_lock = 0x5555;
-       if ((ar7_wdt->kick_lock & 3) == 1) {
-               ar7_wdt->kick_lock = 0xaaaa;
-               if ((ar7_wdt->kick_lock & 3) == 3) {
-                       ar7_wdt->kick = value;
+       WRITE_REG(ar7_wdt->kick_lock, 0x5555);
+       if ((READ_REG(ar7_wdt->kick_lock) & 3) == 1) {
+               WRITE_REG(ar7_wdt->kick_lock, 0xaaaa);
+               if ((READ_REG(ar7_wdt->kick_lock) & 3) == 3) {
+                       WRITE_REG(ar7_wdt->kick, value);
                        return;
                }
        }
@@ -106,11 +109,11 @@ static void ar7_wdt_kick(u32 value)
 
 static void ar7_wdt_prescale(u32 value)
 {
-       ar7_wdt->prescale_lock = 0x5a5a;
-       if ((ar7_wdt->prescale_lock & 3) == 1) {
-               ar7_wdt->prescale_lock = 0xa5a5;
-               if ((ar7_wdt->prescale_lock & 3) == 3) {
-                       ar7_wdt->prescale = value;
+       WRITE_REG(ar7_wdt->prescale_lock, 0x5a5a);
+       if ((READ_REG(ar7_wdt->prescale_lock) & 3) == 1) {
+               WRITE_REG(ar7_wdt->prescale_lock, 0xa5a5);
+               if ((READ_REG(ar7_wdt->prescale_lock) & 3) == 3) {
+                       WRITE_REG(ar7_wdt->prescale, value);
                        return;
                }
        }
@@ -119,11 +122,11 @@ static void ar7_wdt_prescale(u32 value)
 
 static void ar7_wdt_change(u32 value)
 {
-       ar7_wdt->change_lock = 0x6666;
-       if ((ar7_wdt->change_lock & 3) == 1) {
-               ar7_wdt->change_lock = 0xbbbb;
-               if ((ar7_wdt->change_lock & 3) == 3) {
-                       ar7_wdt->change = value;
+       WRITE_REG(ar7_wdt->change_lock, 0x6666);
+       if ((READ_REG(ar7_wdt->change_lock) & 3) == 1) {
+               WRITE_REG(ar7_wdt->change_lock, 0xbbbb);
+               if ((READ_REG(ar7_wdt->change_lock) & 3) == 3) {
+                       WRITE_REG(ar7_wdt->change, value);
                        return;
                }
        }
@@ -132,13 +135,13 @@ static void ar7_wdt_change(u32 value)
 
 static void ar7_wdt_disable(u32 value)
 {
-       ar7_wdt->disable_lock = 0x7777;
-       if ((ar7_wdt->disable_lock & 3) == 1) {
-               ar7_wdt->disable_lock = 0xcccc;
-               if ((ar7_wdt->disable_lock & 3) == 2) {
-                       ar7_wdt->disable_lock = 0xdddd;
-                       if ((ar7_wdt->disable_lock & 3) == 3) {
-                               ar7_wdt->disable = value;
+       WRITE_REG(ar7_wdt->disable_lock, 0x7777);
+       if ((READ_REG(ar7_wdt->disable_lock) & 3) == 1) {
+               WRITE_REG(ar7_wdt->disable_lock, 0xcccc);
+               if ((READ_REG(ar7_wdt->disable_lock) & 3) == 2) {
+                       WRITE_REG(ar7_wdt->disable_lock, 0xdddd);
+                       if ((READ_REG(ar7_wdt->disable_lock) & 3) == 3) {
+                               WRITE_REG(ar7_wdt->disable, value);
                                return;
                        }
                }
@@ -186,13 +189,13 @@ static int ar7_wdt_open(struct inode *inode, struct file *file)
 
 static int ar7_wdt_release(struct inode *inode, struct file *file)
 {
-       if (!expect_close) {
+       if (!expect_close)
                printk(KERN_WARNING DRVNAME
                ": watchdog device closed unexpectedly,"
                "will not disable the watchdog timer\n");
-       } else if (!nowayout) {
+       else if (!nowayout)
                ar7_wdt_disable_wdt();
-       }
+
        up(&open_semaphore);
 
        return 0;
@@ -280,24 +283,24 @@ static int ar7_wdt_ioctl(struct inode *inode, struct file *file,
 }
 
 static struct file_operations ar7_wdt_fops = {
-       .owner   = THIS_MODULE,
-       .write   = ar7_wdt_write,
-       .ioctl   = ar7_wdt_ioctl,
-       .open    = ar7_wdt_open,
-       .release = ar7_wdt_release,
+       .owner          = THIS_MODULE,
+       .write          = ar7_wdt_write,
+       .ioctl          = ar7_wdt_ioctl,
+       .open           = ar7_wdt_open,
+       .release        = ar7_wdt_release,
 };
 
 static struct miscdevice ar7_wdt_miscdev = {
-       .minor = WATCHDOG_MINOR,
-       .name  = "watchdog",
-       .fops  = &ar7_wdt_fops,
+       .minor          = WATCHDOG_MINOR,
+       .name           = "watchdog",
+       .fops           = &ar7_wdt_fops,
 };
 
 static int __init ar7_wdt_init(void)
 {
        int rc;
 
-    ar7_wdt_get_regs();
+       ar7_wdt_get_regs();
 
        if (!request_mem_region(ar7_regs_wdt, sizeof(struct ar7_wdt),
                                                        LONGNAME)) {