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-a3cf2f4a3e73master
parent
fb557d90cc
commit
fcf32e702a
|
@ -2134,7 +2134,7 @@
|
|||
+
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ar231x/ar2315.c
|
||||
@@ -0,0 +1,623 @@
|
||||
@@ -0,0 +1,624 @@
|
||||
+/*
|
||||
+ * This file is subject to the terms and conditions of the GNU General Public
|
||||
+ * License. See the file "COPYING" in the main directory of this archive
|
||||
|
@ -2234,9 +2234,10 @@
|
|||
+ ar2315_gpio_irq();
|
||||
+ else if (misc_intr & AR2315_ISR_UART0)
|
||||
+ do_IRQ(AR531X_MISC_IRQ_UART0);
|
||||
+ else if (misc_intr & AR2315_ISR_WD)
|
||||
+ else if (misc_intr & AR2315_ISR_WD) {
|
||||
+ ar231x_write_reg(AR2315_ISR, AR2315_ISR_WD);
|
||||
+ do_IRQ(AR531X_MISC_IRQ_WATCHDOG);
|
||||
+ else
|
||||
+ } else
|
||||
+ do_IRQ(AR531X_MISC_IRQ_NONE);
|
||||
+ } else if (pending & CAUSEF_IP7)
|
||||
+ do_IRQ(AR531X_IRQ_CPU_CLOCK);
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue