KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

atheros[ar2315-wdt]: update interrupt handling

Browse source 
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>

SVN-Revision: 41687
This commit is contained in:
Felix Fietkau 2014-07-17 16:36:10 +00:00
parent d0f9972f1c
commit 5ea0cff89c
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
target/linux/atheros/patches-3.10/100-board.patch
View file

@ -2134,7 +2134,7 @@
+ +
--- /dev/null --- /dev/null
+++ b/arch/mips/ar231x/ar2315.c +++ 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 + * 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 + * License. See the file "COPYING" in the main directory of this archive
@ -2234,9 +2234,10 @@
+ ar2315_gpio_irq(); + ar2315_gpio_irq();
+ else if (misc_intr & AR2315_ISR_UART0) + else if (misc_intr & AR2315_ISR_UART0)
+ do_IRQ(AR531X_MISC_IRQ_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); + do_IRQ(AR531X_MISC_IRQ_WATCHDOG);
+ else + } else
+ do_IRQ(AR531X_MISC_IRQ_NONE); + do_IRQ(AR531X_MISC_IRQ_NONE);
+ } else if (pending & CAUSEF_IP7) + } else if (pending & CAUSEF_IP7)
+ do_IRQ(AR531X_IRQ_CPU_CLOCK); + do_IRQ(AR531X_IRQ_CPU_CLOCK);

5
target/linux/atheros/patches-3.10/130-watchdog.patch
View file

@ -1,6 +1,6 @@
--- /dev/null --- /dev/null
+++ b/drivers/watchdog/ar2315-wtd.c +++ 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 + * 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 + * it under the terms of the GNU General Public License as published by
@ -52,7 +52,6 @@
+ar2315_wdt_enable(void) +ar2315_wdt_enable(void)
+{ +{
+ ar231x_write_reg(AR2315_WD, wdt_timeout * CLOCK_RATE); + ar231x_write_reg(AR2315_WD, wdt_timeout * CLOCK_RATE);
+ ar231x_write_reg(AR2315_ISR, 0x80);
+} +}
+ +
+static ssize_t +static ssize_t
@ -92,7 +91,6 @@
+ } else { + } else {
+ ar231x_write_reg(AR2315_WDC, 0); + ar231x_write_reg(AR2315_WDC, 0);
+ ar231x_write_reg(AR2315_WD, 0); + ar231x_write_reg(AR2315_WD, 0);
+ ar231x_write_reg(AR2315_ISR, 0x80);
+ } + }
+ return IRQ_HANDLED; + return IRQ_HANDLED;
+} +}
@ -151,7 +149,6 @@
+{ +{
+ int ret = 0; + int ret = 0;
+ +
+ ar2315_wdt_enable();
+ ret = request_irq(AR531X_MISC_IRQ_WATCHDOG, ar2315_wdt_interrupt, + ret = request_irq(AR531X_MISC_IRQ_WATCHDOG, ar2315_wdt_interrupt,
+ IRQF_DISABLED, DRIVER_NAME, dev); + IRQF_DISABLED, DRIVER_NAME, dev);
+ if (ret) { + if (ret) {