atheros[ar2315-wdt]: update I/O handling

 * Pass iomem and IRQ via platform device resources
 * Remap iomem and use iowrite32 accessor function

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
SVN-Revision: 41688

diff --git a/target/linux/atheros/patches-3.10/100-board.patch b/target/linux/atheros/patches-3.10/100-board.patch
index 316982753c448a7a0d9a36e947f4b6c58f3c8f6f..28c93bee8bcc4c90200cb9bb6047e84101b53c9f 100644 (file)
--- a/target/linux/atheros/patches-3.10/100-board.patch
+++ b/target/linux/atheros/patches-3.10/100-board.patch
@@ -2134,7 +2134,7 @@
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar2315.c
-@@ -0,0 +1,624 @@
+@@ -0,0 +1,639 @@
 +/*
 + * 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
@@ -2524,9 +2524,24 @@
 +      .num_resources = ARRAY_SIZE(ar2315_spiflash_res)
 +};
 +
++static struct resource ar2315_wdt_res[] = {
++      {
++              .flags = IORESOURCE_MEM,
++              .start = AR2315_WD,
++              .end = AR2315_WD + 8 - 1,
++      },
++      {
++              .flags = IORESOURCE_IRQ,
++              .start = AR531X_MISC_IRQ_WATCHDOG,
++              .end = AR531X_MISC_IRQ_WATCHDOG,
++      }
++};
++
 +static struct platform_device ar2315_wdt = {
 +      .id = 0,
 +      .name = "ar2315-wdt",
++      .resource = ar2315_wdt_res,
++      .num_resources = ARRAY_SIZE(ar2315_wdt_res)
 +};
 +
 +/*

diff --git a/target/linux/atheros/patches-3.10/130-watchdog.patch b/target/linux/atheros/patches-3.10/130-watchdog.patch
index 06c8d44a45d791f5754e05d69f6b1a7be20d43d4..13eca59edab90a43b95367d20b587968bace00f7 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,186 @@
+@@ -0,0 +1,209 @@
 +/*
 + * 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
@@ -35,23 +35,32 @@
 +#include <linux/io.h>
 +#include <linux/uaccess.h>
 +
-+#include <ar231x_platform.h>
-+#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)
 +
++#define WDT_REG_TIMER         0x00
++#define WDT_REG_CTRL          0x04
++
++#define WDT_CTRL_ACT_NONE     0x00000000      /* No action */
++#define WDT_CTRL_ACT_NMI      0x00000001      /* NMI on watchdog */
++#define WDT_CTRL_ACT_RESET    0x00000002      /* reset on watchdog */
++
 +static int wdt_timeout = 20;
 +static int started;
 +static int in_use;
++static void __iomem *wdt_base;
++
++static inline void ar2315_wdt_wr(unsigned reg, u32 val)
++{
++      iowrite32(val, wdt_base + reg);
++}
 +
 +static void
 +ar2315_wdt_enable(void)
 +{
-+      ar231x_write_reg(AR2315_WD, wdt_timeout * CLOCK_RATE);
++      ar2315_wdt_wr(WDT_REG_TIMER, wdt_timeout * CLOCK_RATE);
 +}
 +
 +static ssize_t
@@ -89,8 +98,8 @@
 +              dev_crit(&pdev->dev, "watchdog expired, rebooting system\n");
 +              emergency_restart();
 +      } else {
-+              ar231x_write_reg(AR2315_WDC, 0);
-+              ar231x_write_reg(AR2315_WD, 0);
++              ar2315_wdt_wr(WDT_REG_CTRL, 0);
++              ar2315_wdt_wr(WDT_REG_TIMER, 0);
 +      }
 +      return IRQ_HANDLED;
 +}
@@ -147,10 +156,25 @@
 +static int
 +ar2315_wdt_probe(struct platform_device *dev)
 +{
++      struct resource *mem_res, *irq_res;
 +      int ret = 0;
 +
-+      ret = request_irq(AR531X_MISC_IRQ_WATCHDOG, ar2315_wdt_interrupt,
-+                        IRQF_DISABLED, DRIVER_NAME, dev);
++      if (wdt_base)
++              return -EBUSY;
++
++      irq_res = platform_get_resource(dev, IORESOURCE_IRQ, 0);
++      if (!irq_res) {
++              dev_err(&dev->dev, "no IRQ resource\n");
++              return -ENOENT;
++      }
++
++      mem_res = platform_get_resource(dev, IORESOURCE_MEM, 0);
++      wdt_base = devm_ioremap_resource(&dev->dev, mem_res);
++      if (IS_ERR(wdt_base))
++              return PTR_ERR(wdt_base);
++
++      ret = devm_request_irq(&dev->dev, irq_res->start, ar2315_wdt_interrupt,
++                             IRQF_DISABLED, DRIVER_NAME, dev);
 +      if (ret) {
 +              dev_err(&dev->dev, "failed to register inetrrupt\n");
 +              goto out;
@@ -168,7 +192,6 @@
 +ar2315_wdt_remove(struct platform_device *dev)
 +{
 +      misc_deregister(&ar2315_wdt_miscdev);
-+      free_irq(AR531X_MISC_IRQ_WATCHDOG, NULL);
 +      return 0;
 +}
 +