atheros[ar2315-wdt]: update interrupt handling

[openwrt/openwrt.git] / target / linux / atheros / patches-3.10 / 130-watchdog.patch

diff --git a/target/linux/atheros/patches-3.10/130-watchdog.patch b/target/linux/atheros/patches-3.10/130-watchdog.patch
index 2ae6dcc0f0e8455666fe03331c056f5c5064cd22..06c8d44a45d791f5754e05d69f6b1a7be20d43d4 100644 (file)
--- 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,197 @@
+@@ -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
@@ -39,6 +39,8 @@
 +#include <ar2315_regs.h>
 +#include <ar231x.h>
 +
++#define DRIVER_NAME   "ar2315-wdt"
++
 +#define CLOCK_RATE 40000000
 +#define HEARTBEAT(x) (x < 1 || x > 90 ? 20 : x)
 +
@@ -50,11 +52,11 @@
 +ar2315_wdt_enable(void)
 +{
 +      ar231x_write_reg(AR2315_WD, wdt_timeout * CLOCK_RATE);
-+      ar231x_write_reg(AR2315_ISR, 0x80);
 +}
 +
 +static ssize_t
-+ar2315_wdt_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
++ar2315_wdt_write(struct file *file, const char __user *data, size_t len,
++               loff_t *ppos)
 +{
 +      if (len)
 +              ar2315_wdt_enable();
@@ -89,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;
 +}
@@ -128,7 +129,7 @@
 +      return ret;
 +}
 +
-+static struct file_operations ar2315_wdt_fops = {
++static const struct file_operations ar2315_wdt_fops = {
 +      .owner          = THIS_MODULE,
 +      .llseek         = no_llseek,
 +      .write          = ar2315_wdt_write,
@@ -148,9 +149,8 @@
 +{
 +      int ret = 0;
 +
-+      ar2315_wdt_enable();
 +      ret = request_irq(AR531X_MISC_IRQ_WATCHDOG, ar2315_wdt_interrupt,
-+                        IRQF_DISABLED, "ar2315_wdt", dev);
++                        IRQF_DISABLED, DRIVER_NAME, dev);
 +      if (ret) {
 +              dev_err(&dev->dev, "failed to register inetrrupt\n");
 +              goto out;
@@ -176,39 +176,29 @@
 +      .probe = ar2315_wdt_probe,
 +      .remove = ar2315_wdt_remove,
 +      .driver = {
-+              .name = "ar2315_wdt",
++              .name = DRIVER_NAME,
 +              .owner = THIS_MODULE,
 +      },
 +};
 +
-+static int __init
-+init_ar2315_wdt(void)
-+{
-+      int ret = platform_driver_register(&ar2315_wdt_driver);
-+      if (ret)
-+              pr_err("ar2315_wdt: error registering platfom driver!\n");
-+      return ret;
-+}
-+
-+static void __exit
-+exit_ar2315_wdt(void)
-+{
-+      platform_driver_unregister(&ar2315_wdt_driver);
-+}
++module_platform_driver(ar2315_wdt_driver);
 +
-+module_init(init_ar2315_wdt);
-+module_exit(exit_ar2315_wdt);
++MODULE_DESCRIPTION("Atheros AR2315 hardware watchdog driver");
++MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:" DRIVER_NAME);
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -1113,6 +1113,12 @@ config LANTIQ_WDT
+@@ -1113,6 +1113,13 @@ config LANTIQ_WDT
        help
          Hardware driver for the Lantiq SoC Watchdog Timer.
  
-+config ATHEROS_WDT
-+      tristate "Atheros wisoc Watchdog Timer"
++config AR2315_WDT
++      tristate "Atheros AR2315+ WiSoCs Watchdog Timer"
 +      depends on ATHEROS_AR231X
 +      help
-+        Hardware driver for the Atheros wisoc Watchdog Timer.
++        Hardware driver for the built-in watchdog timer on the Atheros
++        AR2315/AR2316 WiSoCs.
 +
  # PARISC Architecture
  
@@ -219,7 +209,7 @@
  obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
  obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
  obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
-+obj-$(CONFIG_ATHEROS_WDT) += ar2315-wtd.o
++obj-$(CONFIG_AR2315_WDT) += ar2315-wtd.o
  obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
  obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
  octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o