Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / char / watchdog / mpc8xx_wdt.c

diff --git a/drivers/char/watchdog/mpc8xx_wdt.c b/drivers/char/watchdog/mpc8xx_wdt.c
index 56d62ba..b2fc71e 100644 (file)
--- a/drivers/char/watchdog/mpc8xx_wdt.c
+++ b/drivers/char/watchdog/mpc8xx_wdt.c
@@ -18,6 +18,7 @@
 #include <linux/watchdog.h>
 #include <asm/8xx_immap.h>
 #include <asm/uaccess.h>
+#include <asm/io.h>
 #include <syslib/m8xx_wdt.h>
 
 static unsigned long wdt_opened;
@@ -25,18 +26,26 @@ static int wdt_status;
 
 static void mpc8xx_wdt_handler_disable(void)
 {
-       volatile immap_t *imap = (volatile immap_t *)IMAP_ADDR;
+       volatile uint __iomem *piscr;
+       piscr = (uint *)&((immap_t*)IMAP_ADDR)->im_sit.sit_piscr;
 
-       imap->im_sit.sit_piscr &= ~(PISCR_PIE | PISCR_PTE);
+       if (!m8xx_has_internal_rtc)
+               m8xx_wdt_stop_timer();
+       else
+               out_be32(piscr, in_be32(piscr) & ~(PISCR_PIE | PISCR_PTE));
 
        printk(KERN_NOTICE "mpc8xx_wdt: keep-alive handler deactivated\n");
 }
 
 static void mpc8xx_wdt_handler_enable(void)
 {
-       volatile immap_t *imap = (volatile immap_t *)IMAP_ADDR;
+       volatile uint __iomem *piscr;
+       piscr = (uint *)&((immap_t*)IMAP_ADDR)->im_sit.sit_piscr;
 
-       imap->im_sit.sit_piscr |= PISCR_PIE | PISCR_PTE;
+       if (!m8xx_has_internal_rtc)
+               m8xx_wdt_install_timer();
+       else
+               out_be32(piscr, in_be32(piscr) | PISCR_PIE | PISCR_PTE);
 
        printk(KERN_NOTICE "mpc8xx_wdt: keep-alive handler activated\n");
 }
@@ -68,9 +77,6 @@ static int mpc8xx_wdt_release(struct inode *inode, struct file *file)
 static ssize_t mpc8xx_wdt_write(struct file *file, const char *data, size_t len,
                                loff_t * ppos)
 {
-       if (ppos != &file->f_pos)
-               return -ESPIPE;
-
        if (len)
                m8xx_wdt_reset();