From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 27 May 2009 15:33:18 +0000 (+0000)
Subject: avila-wdt: add support for disabling the watchdog
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=b49e880ccb038f1e0f9326410ade340421406477

avila-wdt: add support for disabling the watchdog

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16111 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/avila-wdt/src/avila-wdt.c b/package/avila-wdt/src/avila-wdt.c
index 6b3b42b09..18644bc60 100644
--- a/package/avila-wdt/src/avila-wdt.c
+++ b/package/avila-wdt/src/avila-wdt.c
@@ -74,10 +74,8 @@ static void wdt_enable(void)
 
 static void wdt_disable(void)
 {
-	/* NB: we can't turn off the watchdog anymore, so we
-	 * have to keep running the strobe timer without decrementing
-	 * the counter */
-	clear_bit(WDT_RUNNING, &wdt_status);
+	/* Re-enable clock generator output on GPIO 14/15 */
+	*IXP4XX_GPIO_GPCLKR |= (1 << 8);
 }
 
 static int avila_wdt_open(struct inode *inode, struct file *file)
@@ -209,6 +207,8 @@ static int __init avila_wdt_init(void)
 static void __exit avila_wdt_exit(void)
 {
 	misc_deregister(&avila_wdt_miscdev);
+	del_timer(&wdt_timer);
+	wdt_disable();
 }