aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-3.10/130-watchdog.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-07-17 16:36:10 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-07-17 16:36:10 +0000
commitfcf32e702a5141fc70b0854ad75cdce8640667ff (patch)
tree3ad9c8e7986aea99f9a7c3bc3dd67a67a91a4a7a /target/linux/atheros/patches-3.10/130-watchdog.patch
parentfb557d90cc17015b5fb0875dbecd3907893c2ceb (diff)
downloadupstream-fcf32e702a5141fc70b0854ad75cdce8640667ff.tar.gz
upstream-fcf32e702a5141fc70b0854ad75cdce8640667ff.tar.bz2
upstream-fcf32e702a5141fc70b0854ad75cdce8640667ff.zip
atheros[ar2315-wdt]: update interrupt handling
Acknowledge watchdog interrupt in arch irq dispatcher and remove odd watchdog enable call from probe function. Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41687 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-3.10/130-watchdog.patch')
-rw-r--r--target/linux/atheros/patches-3.10/130-watchdog.patch5
1 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/atheros/patches-3.10/130-watchdog.patch b/target/linux/atheros/patches-3.10/130-watchdog.patch
index b0284e738d..06c8d44a45 100644
--- a/target/linux/atheros/patches-3.10/130-watchdog.patch
+++ b/target/linux/atheros/patches-3.10/130-watchdog.patch
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/drivers/watchdog/ar2315-wtd.c
-@@ -0,0 +1,189 @@
+@@ -0,0 +1,186 @@
+/*
+ * 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
@@ -52,7 +52,6 @@
+ar2315_wdt_enable(void)
+{
+ ar231x_write_reg(AR2315_WD, wdt_timeout * CLOCK_RATE);
-+ ar231x_write_reg(AR2315_ISR, 0x80);
+}
+
+static ssize_t
@@ -92,7 +91,6 @@
+ } else {
+ ar231x_write_reg(AR2315_WDC, 0);
+ ar231x_write_reg(AR2315_WD, 0);
-+ ar231x_write_reg(AR2315_ISR, 0x80);
+ }
+ return IRQ_HANDLED;
+}
@@ -151,7 +149,6 @@
+{
+ int ret = 0;
+
-+ ar2315_wdt_enable();
+ ret = request_irq(AR531X_MISC_IRQ_WATCHDOG, ar2315_wdt_interrupt,
+ IRQF_DISABLED, DRIVER_NAME, dev);
+ if (ret) {