Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Feb 2015 16:42:47 +0000 (08:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Feb 2015 16:42:47 +0000 (08:42 -0800)
Pull watchdog updates from Wim Van Sebroeck:
 "This adds the following new drivers:

   - ImgTec PDC Watchdog Timer Driver,
   - Mediatek SoC integrated watchdog

  Add support for BCM5301X, IT8783, NCT6791 and NCT6792 WDT's

  Add bcm47xx_wdt and da9063 restart handlers and contains overall
  improvements and fixes"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: bcm47xx_wdt.c: allow enabling on BCM5301X arch
  watchdog: jz4740: Add DT support
  dt: watchdog: Add DT binding documentation for jz4740 watchdog timer
  watchdog: dw_wdt: Try to get a 30 second watchdog by default
  watchdog: dw_wdt: pat the watchdog before enabling it
  watchdog: w83627hf_wdt: Add support for NCT6791 and NCT6792
  watchdog: bcm47xx_wdt.c: add restart handler support
  watchdog: gpio_wdt: Add "always_running" feature to GPIO watchdog
  watchdog: da9063: Add restart handler support
  ARM: mediatek: dts: Add bindings for watchdog
  watchdog: Add driver for Mediatek watchdog
  watchdog: Fix omap watchdogs to enable the magic close bit
  watchdog: rt2880_wdt: minor clean up
  watchdog: hpwdt: Fix initialization message in hpwdt.c
  watchdog: it87_wdt: add IT8783 ID
  watchdog: imx2: Constify struct regmap_config and watchdog_ops
  DT: watchdog: Add ImgTec PDC Watchdog Timer binding documentation
  watchdog: ImgTec PDC Watchdog Timer Driver

22 files changed:
Documentation/devicetree/bindings/watchdog/gpio-wdt.txt
Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt [new file with mode: 0644]
Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt [new file with mode: 0644]
Documentation/devicetree/bindings/watchdog/mtk-wdt.txt [new file with mode: 0644]
drivers/watchdog/Kconfig
drivers/watchdog/Makefile
drivers/watchdog/bcm47xx_wdt.c
drivers/watchdog/da9063_wdt.c
drivers/watchdog/dw_wdt.c
drivers/watchdog/gpio_wdt.c
drivers/watchdog/hpwdt.c
drivers/watchdog/imgpdc_wdt.c [new file with mode: 0644]
drivers/watchdog/imx2_wdt.c
drivers/watchdog/it87_wdt.c
drivers/watchdog/jz4740_wdt.c
drivers/watchdog/mtk_wdt.c [new file with mode: 0644]
drivers/watchdog/omap_wdt.c
drivers/watchdog/retu_wdt.c
drivers/watchdog/rt2880_wdt.c
drivers/watchdog/twl4030_wdt.c
drivers/watchdog/w83627hf_wdt.c
include/linux/bcm47xx_wdt.h

index 37afec194949a3ca07f8ae476f1d681e4bdeedc4..198794963786bac2d46e4e9af0b39b28828669f2 100644 (file)
@@ -13,6 +13,11 @@ Required Properties:
     by the GPIO flags.
 - hw_margin_ms: Maximum time to reset watchdog circuit (milliseconds).
 
+Optional Properties:
+- always-running: If the watchdog timer cannot be disabled, add this flag to
+  have the driver keep toggling the signal without a client. It will only cease
+  to toggle the signal when the device is open and the timeout elapsed.
+
 Example:
        watchdog: watchdog {
                /* ADM706 */
diff --git a/Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt b/Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt
new file mode 100644 (file)
index 0000000..b2fa11f
--- /dev/null
@@ -0,0 +1,19 @@
+*ImgTec PowerDown Controller (PDC) Watchdog Timer (WDT)
+
+Required properties:
+- compatible : Should be "img,pdc-wdt"
+- reg : Should contain WDT registers location and length
+- clocks: Must contain an entry for each entry in clock-names.
+- clock-names: Should contain "wdt" and "sys"; the watchdog counter
+               clock and register interface clock respectively.
+- interrupts : Should contain WDT interrupt
+
+Examples:
+
+watchdog@18102100 {
+       compatible = "img,pdc-wdt";
+       reg = <0x18102100 0x100>;
+       clocks = <&pdc_wdt_clk>, <&sys_clk>;
+       clock-names = "wdt", "sys";
+       interrupts = <0 52 IRQ_TYPE_LEVEL_HIGH>;
+};
diff --git a/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt b/Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt
new file mode 100644 (file)
index 0000000..e27763e
--- /dev/null
@@ -0,0 +1,12 @@
+Ingenic Watchdog Timer (WDT) Controller for JZ4740
+
+Required properties:
+compatible: "ingenic,jz4740-watchdog"
+reg: Register address and length for watchdog registers
+
+Example:
+
+watchdog: jz4740-watchdog@0x10002000 {
+       compatible = "ingenic,jz4740-watchdog";
+       reg = <0x10002000 0x100>;
+};
diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
new file mode 100644 (file)
index 0000000..af9eb5b
--- /dev/null
@@ -0,0 +1,13 @@
+Mediatek SoCs Watchdog timer
+
+Required properties:
+
+- compatible : should be "mediatek,mt6589-wdt"
+- reg : Specifies base physical address and size of the registers.
+
+Example:
+
+wdt: watchdog@010000000 {
+       compatible = "mediatek,mt6589-wdt";
+       reg = <0x10000000 0x18>;
+};
index 08f41add146134db9c6975f277b998dee77c70f3..16f20235099768d91f10931841e25176af59ef7e 100644 (file)
@@ -505,6 +505,16 @@ config MESON_WATCHDOG
          To compile this driver as a module, choose M here: the
          module will be called meson_wdt.
 
+config MEDIATEK_WATCHDOG
+       tristate "Mediatek SoCs watchdog support"
+       depends on ARCH_MEDIATEK
+       select WATCHDOG_CORE
+       help
+         Say Y here to include support for the watchdog timer
+         in Mediatek SoCs.
+         To compile this driver as a module, choose M here: the
+         module will be called mtk_wdt.
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT
@@ -1005,6 +1015,8 @@ config W83627HF_WDT
                NCT6775
                NCT6776
                NCT6779
+               NCT6791
+               NCT6792
 
          This watchdog simply watches your kernel to make sure it doesn't
          freeze, and if it does, it reboots your computer after a certain
@@ -1101,7 +1113,7 @@ config ATH79_WDT
 
 config BCM47XX_WDT
        tristate "Broadcom BCM47xx Watchdog Timer"
-       depends on BCM47XX
+       depends on BCM47XX || ARCH_BCM_5301X
        select WATCHDOG_CORE
        help
          Hardware driver for the Broadcom BCM47xx Watchdog Timer.
@@ -1235,6 +1247,17 @@ config BCM_KONA_WDT_DEBUG
 
          If in doubt, say 'N'.
 
+config IMGPDC_WDT
+       tristate "Imagination Technologies PDC Watchdog Timer"
+       depends on HAS_IOMEM
+       depends on METAG || MIPS || COMPILE_TEST
+       help
+         Driver for Imagination Technologies PowerDown Controller
+         Watchdog Timer.
+
+         To compile this driver as a loadable module, choose M here.
+         The module will be called imgpdc_wdt.
+
 config LANTIQ_WDT
        tristate "Lantiq SoC watchdog"
        depends on LANTIQ
index c569ec8f8a76b9d78ad4a8ef8d61313cb1ae7ce9..5c19294d1c3015acaf14e4a52734f0c82ae798db 100644 (file)
@@ -63,6 +63,7 @@ obj-$(CONFIG_QCOM_WDT) += qcom-wdt.o
 obj-$(CONFIG_BCM_KONA_WDT) += bcm_kona_wdt.o
 obj-$(CONFIG_TEGRA_WATCHDOG) += tegra_wdt.o
 obj-$(CONFIG_MESON_WATCHDOG) += meson_wdt.o
+obj-$(CONFIG_MEDIATEK_WATCHDOG) += mtk_wdt.o
 
 # AVR32 Architecture
 obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
@@ -142,6 +143,7 @@ obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
 octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o
 obj-$(CONFIG_LANTIQ_WDT) += lantiq_wdt.o
 obj-$(CONFIG_RALINK_WDT) += rt2880_wdt.o
+obj-$(CONFIG_IMGPDC_WDT) += imgpdc_wdt.o
 
 # PARISC Architecture
 
index 9816485f68252254907b60e744058bc32d1f3065..b28a072abf78fbe030f647ef491e8fc24bc157d4 100644 (file)
@@ -169,6 +169,17 @@ static int bcm47xx_wdt_notify_sys(struct notifier_block *this,
        return NOTIFY_DONE;
 }
 
+static int bcm47xx_wdt_restart(struct notifier_block *this, unsigned long mode,
+                              void *cmd)
+{
+       struct bcm47xx_wdt *wdt;
+
+       wdt = container_of(this, struct bcm47xx_wdt, restart_handler);
+       wdt->timer_set(wdt, 1);
+
+       return NOTIFY_DONE;
+}
+
 static struct watchdog_ops bcm47xx_wdt_soft_ops = {
        .owner          = THIS_MODULE,
        .start          = bcm47xx_wdt_soft_start,
@@ -209,15 +220,23 @@ static int bcm47xx_wdt_probe(struct platform_device *pdev)
        if (ret)
                goto err_timer;
 
-       ret = watchdog_register_device(&wdt->wdd);
+       wdt->restart_handler.notifier_call = &bcm47xx_wdt_restart;
+       wdt->restart_handler.priority = 64;
+       ret = register_restart_handler(&wdt->restart_handler);
        if (ret)
                goto err_notifier;
 
+       ret = watchdog_register_device(&wdt->wdd);
+       if (ret)
+               goto err_handler;
+
        dev_info(&pdev->dev, "BCM47xx Watchdog Timer enabled (%d seconds%s%s)\n",
                timeout, nowayout ? ", nowayout" : "",
                soft ? ", Software Timer" : "");
        return 0;
 
+err_handler:
+       unregister_restart_handler(&wdt->restart_handler);
 err_notifier:
        unregister_reboot_notifier(&wdt->notifier);
 err_timer:
index 2cd6b2c2dd2a6980cbbefdb45a561fa2715f3982..e2fe2ebdebd4d6bb12bf41adb1f11c9654306963 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/mfd/da9063/registers.h>
 #include <linux/mfd/da9063/core.h>
+#include <linux/reboot.h>
 #include <linux/regmap.h>
 
 /*
@@ -38,6 +39,7 @@ static const unsigned int wdt_timeout[] = { 0, 2, 4, 8, 16, 32, 65, 131 };
 struct da9063_watchdog {
        struct da9063 *da9063;
        struct watchdog_device wdtdev;
+       struct notifier_block restart_handler;
 };
 
 static unsigned int da9063_wdt_timeout_to_sel(unsigned int secs)
@@ -119,6 +121,23 @@ static int da9063_wdt_set_timeout(struct watchdog_device *wdd,
        return ret;
 }
 
+static int da9063_wdt_restart_handler(struct notifier_block *this,
+                                     unsigned long mode, void *cmd)
+{
+       struct da9063_watchdog *wdt = container_of(this,
+                                                  struct da9063_watchdog,
+                                                  restart_handler);
+       int ret;
+
+       ret = regmap_write(wdt->da9063->regmap, DA9063_REG_CONTROL_F,
+                          DA9063_SHUTDOWN);
+       if (ret)
+               dev_alert(wdt->da9063->dev, "Failed to shutdown (err = %d)\n",
+                         ret);
+
+       return NOTIFY_DONE;
+}
+
 static const struct watchdog_info da9063_watchdog_info = {
        .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
        .identity = "DA9063 Watchdog",
@@ -163,14 +182,25 @@ static int da9063_wdt_probe(struct platform_device *pdev)
        dev_set_drvdata(&pdev->dev, wdt);
 
        ret = watchdog_register_device(&wdt->wdtdev);
+       if (ret)
+               return ret;
 
-       return ret;
+       wdt->restart_handler.notifier_call = da9063_wdt_restart_handler;
+       wdt->restart_handler.priority = 128;
+       ret = register_restart_handler(&wdt->restart_handler);
+       if (ret)
+               dev_err(wdt->da9063->dev,
+                       "Failed to register restart handler (err = %d)\n", ret);
+
+       return 0;
 }
 
 static int da9063_wdt_remove(struct platform_device *pdev)
 {
        struct da9063_watchdog *wdt = dev_get_drvdata(&pdev->dev);
 
+       unregister_restart_handler(&wdt->restart_handler);
+
        watchdog_unregister_device(&wdt->wdtdev);
 
        return 0;
index b34a2e4e4e43c38d441a70018f088e7efd9b8608..d0bb9499d12caaa2d901b3454a0c65cf825a9ea4 100644 (file)
@@ -51,6 +51,8 @@
 /* The maximum TOP (timeout period) value that can be set in the watchdog. */
 #define DW_WDT_MAX_TOP         15
 
+#define DW_WDT_DEFAULT_SECONDS 30
+
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
@@ -96,6 +98,12 @@ static inline void dw_wdt_set_next_heartbeat(void)
        dw_wdt.next_heartbeat = jiffies + dw_wdt_get_top() * HZ;
 }
 
+static void dw_wdt_keepalive(void)
+{
+       writel(WDOG_COUNTER_RESTART_KICK_VALUE, dw_wdt.regs +
+              WDOG_COUNTER_RESTART_REG_OFFSET);
+}
+
 static int dw_wdt_set_top(unsigned top_s)
 {
        int i, top_val = DW_WDT_MAX_TOP;
@@ -110,21 +118,27 @@ static int dw_wdt_set_top(unsigned top_s)
                        break;
                }
 
-       /* Set the new value in the watchdog. */
+       /*
+        * Set the new value in the watchdog.  Some versions of dw_wdt
+        * have have TOPINIT in the TIMEOUT_RANGE register (as per
+        * CP_WDT_DUAL_TOP in WDT_COMP_PARAMS_1).  On those we
+        * effectively get a pat of the watchdog right here.
+        */
        writel(top_val | top_val << WDOG_TIMEOUT_RANGE_TOPINIT_SHIFT,
                dw_wdt.regs + WDOG_TIMEOUT_RANGE_REG_OFFSET);
 
+       /*
+        * Add an explicit pat to handle versions of the watchdog that
+        * don't have TOPINIT.  This won't hurt on versions that have
+        * it.
+        */
+       dw_wdt_keepalive();
+
        dw_wdt_set_next_heartbeat();
 
        return dw_wdt_top_in_seconds(top_val);
 }
 
-static void dw_wdt_keepalive(void)
-{
-       writel(WDOG_COUNTER_RESTART_KICK_VALUE, dw_wdt.regs +
-              WDOG_COUNTER_RESTART_REG_OFFSET);
-}
-
 static int dw_wdt_restart_handle(struct notifier_block *this,
                                unsigned long mode, void *cmd)
 {
@@ -167,9 +181,9 @@ static int dw_wdt_open(struct inode *inode, struct file *filp)
        if (!dw_wdt_is_enabled()) {
                /*
                 * The watchdog is not currently enabled. Set the timeout to
-                * the maximum and then start it.
+                * something reasonable and then start it.
                 */
-               dw_wdt_set_top(DW_WDT_MAX_TOP);
+               dw_wdt_set_top(DW_WDT_DEFAULT_SECONDS);
                writel(WDOG_CONTROL_REG_WDT_EN_MASK,
                       dw_wdt.regs + WDOG_CONTROL_REG_OFFSET);
        }
index bbdb19b4533268cea43775f7507d6ec354d4e2eb..cbc313d37c59f1f67b0bd99fc5835d2d35a14b85 100644 (file)
@@ -31,6 +31,8 @@ struct gpio_wdt_priv {
        int                     gpio;
        bool                    active_low;
        bool                    state;
+       bool                    always_running;
+       bool                    armed;
        unsigned int            hw_algo;
        unsigned int            hw_margin;
        unsigned long           last_jiffies;
@@ -48,14 +50,20 @@ static void gpio_wdt_disable(struct gpio_wdt_priv *priv)
                gpio_direction_input(priv->gpio);
 }
 
-static int gpio_wdt_start(struct watchdog_device *wdd)
+static void gpio_wdt_start_impl(struct gpio_wdt_priv *priv)
 {
-       struct gpio_wdt_priv *priv = watchdog_get_drvdata(wdd);
-
        priv->state = priv->active_low;
        gpio_direction_output(priv->gpio, priv->state);
        priv->last_jiffies = jiffies;
        mod_timer(&priv->timer, priv->last_jiffies + priv->hw_margin);
+}
+
+static int gpio_wdt_start(struct watchdog_device *wdd)
+{
+       struct gpio_wdt_priv *priv = watchdog_get_drvdata(wdd);
+
+       gpio_wdt_start_impl(priv);
+       priv->armed = true;
 
        return 0;
 }
@@ -64,8 +72,11 @@ static int gpio_wdt_stop(struct watchdog_device *wdd)
 {
        struct gpio_wdt_priv *priv = watchdog_get_drvdata(wdd);
 
-       mod_timer(&priv->timer, 0);
-       gpio_wdt_disable(priv);
+       priv->armed = false;
+       if (!priv->always_running) {
+               mod_timer(&priv->timer, 0);
+               gpio_wdt_disable(priv);
+       }
 
        return 0;
 }
@@ -91,8 +102,8 @@ static void gpio_wdt_hwping(unsigned long data)
        struct watchdog_device *wdd = (struct watchdog_device *)data;
        struct gpio_wdt_priv *priv = watchdog_get_drvdata(wdd);
 
-       if (time_after(jiffies, priv->last_jiffies +
-                      msecs_to_jiffies(wdd->timeout * 1000))) {
+       if (priv->armed && time_after(jiffies, priv->last_jiffies +
+                                     msecs_to_jiffies(wdd->timeout * 1000))) {
                dev_crit(wdd->dev, "Timer expired. System will reboot soon!\n");
                return;
        }
@@ -197,6 +208,9 @@ static int gpio_wdt_probe(struct platform_device *pdev)
        /* Use safe value (1/2 of real timeout) */
        priv->hw_margin = msecs_to_jiffies(hw_margin / 2);
 
+       priv->always_running = of_property_read_bool(pdev->dev.of_node,
+                                                    "always-running");
+
        watchdog_set_drvdata(&priv->wdd, priv);
 
        priv->wdd.info          = &gpio_wdt_ident;
@@ -216,8 +230,15 @@ static int gpio_wdt_probe(struct platform_device *pdev)
        priv->notifier.notifier_call = gpio_wdt_notify_sys;
        ret = register_reboot_notifier(&priv->notifier);
        if (ret)
-               watchdog_unregister_device(&priv->wdd);
+               goto error_unregister;
 
+       if (priv->always_running)
+               gpio_wdt_start_impl(priv);
+
+       return 0;
+
+error_unregister:
+       watchdog_unregister_device(&priv->wdd);
        return ret;
 }
 
index 75d2243b94f51ccc2c8b250b46b30d0866c6b3b6..ada3e44f99328424d11994ec03ebdd4886f4a919 100644 (file)
@@ -745,7 +745,7 @@ static int hpwdt_init_nmi_decoding(struct pci_dev *dev)
 
        dev_info(&dev->dev,
                        "HP Watchdog Timer Driver: NMI decoding initialized"
-                       ", allow kernel dump: %s (default = 0/OFF)\n",
+                       ", allow kernel dump: %s (default = 1/ON)\n",
                        (allow_kdump == 0) ? "OFF" : "ON");
        return 0;
 
diff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c
new file mode 100644 (file)
index 0000000..c8def68
--- /dev/null
@@ -0,0 +1,289 @@
+/*
+ * Imagination Technologies PowerDown Controller Watchdog Timer.
+ *
+ * Copyright (c) 2014 Imagination Technologies Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * Based on drivers/watchdog/sunxi_wdt.c Copyright (c) 2013 Carlo Caione
+ *                                                     2012 Henrik Nordstrom
+ */
+
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/log2.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/watchdog.h>
+
+/* registers */
+#define PDC_WDT_SOFT_RESET             0x00
+#define PDC_WDT_CONFIG                 0x04
+  #define PDC_WDT_CONFIG_ENABLE                BIT(31)
+  #define PDC_WDT_CONFIG_DELAY_MASK    0x1f
+
+#define PDC_WDT_TICKLE1                        0x08
+#define PDC_WDT_TICKLE1_MAGIC          0xabcd1234
+#define PDC_WDT_TICKLE2                        0x0c
+#define PDC_WDT_TICKLE2_MAGIC          0x4321dcba
+
+#define PDC_WDT_TICKLE_STATUS_MASK     0x7
+#define PDC_WDT_TICKLE_STATUS_SHIFT    0
+#define PDC_WDT_TICKLE_STATUS_HRESET   0x0  /* Hard reset */
+#define PDC_WDT_TICKLE_STATUS_TIMEOUT  0x1  /* Timeout */
+#define PDC_WDT_TICKLE_STATUS_TICKLE   0x2  /* Tickled incorrectly */
+#define PDC_WDT_TICKLE_STATUS_SRESET   0x3  /* Soft reset */
+#define PDC_WDT_TICKLE_STATUS_USER     0x4  /* User reset */
+
+/* Timeout values are in seconds */
+#define PDC_WDT_MIN_TIMEOUT            1
+#define PDC_WDT_DEF_TIMEOUT            64
+
+static int heartbeat;
+module_param(heartbeat, int, 0);
+MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "
+       "(default = " __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) ")");
+
+static bool nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, bool, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
+       "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+
+struct pdc_wdt_dev {
+       struct watchdog_device wdt_dev;
+       struct clk *wdt_clk;
+       struct clk *sys_clk;
+       void __iomem *base;
+};
+
+static int pdc_wdt_keepalive(struct watchdog_device *wdt_dev)
+{
+       struct pdc_wdt_dev *wdt = watchdog_get_drvdata(wdt_dev);
+
+       writel(PDC_WDT_TICKLE1_MAGIC, wdt->base + PDC_WDT_TICKLE1);
+       writel(PDC_WDT_TICKLE2_MAGIC, wdt->base + PDC_WDT_TICKLE2);
+
+       return 0;
+}
+
+static int pdc_wdt_stop(struct watchdog_device *wdt_dev)
+{
+       unsigned int val;
+       struct pdc_wdt_dev *wdt = watchdog_get_drvdata(wdt_dev);
+
+       val = readl(wdt->base + PDC_WDT_CONFIG);
+       val &= ~PDC_WDT_CONFIG_ENABLE;
+       writel(val, wdt->base + PDC_WDT_CONFIG);
+
+       /* Must tickle to finish the stop */
+       pdc_wdt_keepalive(wdt_dev);
+
+       return 0;
+}
+
+static int pdc_wdt_set_timeout(struct watchdog_device *wdt_dev,
+                              unsigned int new_timeout)
+{
+       unsigned int val;
+       struct pdc_wdt_dev *wdt = watchdog_get_drvdata(wdt_dev);
+       unsigned long clk_rate = clk_get_rate(wdt->wdt_clk);
+
+       wdt->wdt_dev.timeout = new_timeout;
+
+       val = readl(wdt->base + PDC_WDT_CONFIG) & ~PDC_WDT_CONFIG_DELAY_MASK;
+       val |= order_base_2(new_timeout * clk_rate) - 1;
+       writel(val, wdt->base + PDC_WDT_CONFIG);
+
+       return 0;
+}
+
+/* Start the watchdog timer (delay should already be set) */
+static int pdc_wdt_start(struct watchdog_device *wdt_dev)
+{
+       unsigned int val;
+       struct pdc_wdt_dev *wdt = watchdog_get_drvdata(wdt_dev);
+
+       val = readl(wdt->base + PDC_WDT_CONFIG);
+       val |= PDC_WDT_CONFIG_ENABLE;
+       writel(val, wdt->base + PDC_WDT_CONFIG);
+
+       return 0;
+}
+
+static struct watchdog_info pdc_wdt_info = {
+       .identity       = "IMG PDC Watchdog",
+       .options        = WDIOF_SETTIMEOUT |
+                         WDIOF_KEEPALIVEPING |
+                         WDIOF_MAGICCLOSE,
+};
+
+static const struct watchdog_ops pdc_wdt_ops = {
+       .owner          = THIS_MODULE,
+       .start          = pdc_wdt_start,
+       .stop           = pdc_wdt_stop,
+       .ping           = pdc_wdt_keepalive,
+       .set_timeout    = pdc_wdt_set_timeout,
+};
+
+static int pdc_wdt_probe(struct platform_device *pdev)
+{
+       int ret, val;
+       unsigned long clk_rate;
+       struct resource *res;
+       struct pdc_wdt_dev *pdc_wdt;
+
+       pdc_wdt = devm_kzalloc(&pdev->dev, sizeof(*pdc_wdt), GFP_KERNEL);
+       if (!pdc_wdt)
+               return -ENOMEM;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       pdc_wdt->base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(pdc_wdt->base))
+               return PTR_ERR(pdc_wdt->base);
+
+       pdc_wdt->sys_clk = devm_clk_get(&pdev->dev, "sys");
+       if (IS_ERR(pdc_wdt->sys_clk)) {
+               dev_err(&pdev->dev, "failed to get the sys clock\n");
+               return PTR_ERR(pdc_wdt->sys_clk);
+       }
+
+       pdc_wdt->wdt_clk = devm_clk_get(&pdev->dev, "wdt");
+       if (IS_ERR(pdc_wdt->wdt_clk)) {
+               dev_err(&pdev->dev, "failed to get the wdt clock\n");
+               return PTR_ERR(pdc_wdt->wdt_clk);
+       }
+
+       ret = clk_prepare_enable(pdc_wdt->sys_clk);
+       if (ret) {
+               dev_err(&pdev->dev, "could not prepare or enable sys clock\n");
+               return ret;
+       }
+
+       ret = clk_prepare_enable(pdc_wdt->wdt_clk);
+       if (ret) {
+               dev_err(&pdev->dev, "could not prepare or enable wdt clock\n");
+               goto disable_sys_clk;
+       }
+
+       /* We use the clock rate to calculate the max timeout */
+       clk_rate = clk_get_rate(pdc_wdt->wdt_clk);
+       if (clk_rate == 0) {
+               dev_err(&pdev->dev, "failed to get clock rate\n");
+               ret = -EINVAL;
+               goto disable_wdt_clk;
+       }
+
+       if (order_base_2(clk_rate) > PDC_WDT_CONFIG_DELAY_MASK + 1) {
+               dev_err(&pdev->dev, "invalid clock rate\n");
+               ret = -EINVAL;
+               goto disable_wdt_clk;
+       }
+
+       if (order_base_2(clk_rate) == 0)
+               pdc_wdt->wdt_dev.min_timeout = PDC_WDT_MIN_TIMEOUT + 1;
+       else
+               pdc_wdt->wdt_dev.min_timeout = PDC_WDT_MIN_TIMEOUT;
+
+       pdc_wdt->wdt_dev.info = &pdc_wdt_info;
+       pdc_wdt->wdt_dev.ops = &pdc_wdt_ops;
+       pdc_wdt->wdt_dev.max_timeout = 1 << PDC_WDT_CONFIG_DELAY_MASK;
+       pdc_wdt->wdt_dev.parent = &pdev->dev;
+
+       ret = watchdog_init_timeout(&pdc_wdt->wdt_dev, heartbeat, &pdev->dev);
+       if (ret < 0) {
+               pdc_wdt->wdt_dev.timeout = pdc_wdt->wdt_dev.max_timeout;
+               dev_warn(&pdev->dev,
+                        "Initial timeout out of range! setting max timeout\n");
+       }
+
+       pdc_wdt_stop(&pdc_wdt->wdt_dev);
+
+       /* Find what caused the last reset */
+       val = readl(pdc_wdt->base + PDC_WDT_TICKLE1);
+       val = (val & PDC_WDT_TICKLE_STATUS_MASK) >> PDC_WDT_TICKLE_STATUS_SHIFT;
+       switch (val) {
+       case PDC_WDT_TICKLE_STATUS_TICKLE:
+       case PDC_WDT_TICKLE_STATUS_TIMEOUT:
+               pdc_wdt->wdt_dev.bootstatus |= WDIOF_CARDRESET;
+               dev_info(&pdev->dev,
+                        "watchdog module last reset due to timeout\n");
+               break;
+       case PDC_WDT_TICKLE_STATUS_HRESET:
+               dev_info(&pdev->dev,
+                        "watchdog module last reset due to hard reset\n");
+               break;
+       case PDC_WDT_TICKLE_STATUS_SRESET:
+               dev_info(&pdev->dev,
+                        "watchdog module last reset due to soft reset\n");
+               break;
+       case PDC_WDT_TICKLE_STATUS_USER:
+               dev_info(&pdev->dev,
+                        "watchdog module last reset due to user reset\n");
+               break;
+       default:
+               dev_info(&pdev->dev,
+                        "contains an illegal status code (%08x)\n", val);
+               break;
+       }
+
+       watchdog_set_nowayout(&pdc_wdt->wdt_dev, nowayout);
+
+       platform_set_drvdata(pdev, pdc_wdt);
+       watchdog_set_drvdata(&pdc_wdt->wdt_dev, pdc_wdt);
+
+       ret = watchdog_register_device(&pdc_wdt->wdt_dev);
+       if (ret)
+               goto disable_wdt_clk;
+
+       return 0;
+
+disable_wdt_clk:
+       clk_disable_unprepare(pdc_wdt->wdt_clk);
+disable_sys_clk:
+       clk_disable_unprepare(pdc_wdt->sys_clk);
+       return ret;
+}
+
+static void pdc_wdt_shutdown(struct platform_device *pdev)
+{
+       struct pdc_wdt_dev *pdc_wdt = platform_get_drvdata(pdev);
+
+       pdc_wdt_stop(&pdc_wdt->wdt_dev);
+}
+
+static int pdc_wdt_remove(struct platform_device *pdev)
+{
+       struct pdc_wdt_dev *pdc_wdt = platform_get_drvdata(pdev);
+
+       pdc_wdt_stop(&pdc_wdt->wdt_dev);
+       watchdog_unregister_device(&pdc_wdt->wdt_dev);
+       clk_disable_unprepare(pdc_wdt->wdt_clk);
+       clk_disable_unprepare(pdc_wdt->sys_clk);
+
+       return 0;
+}
+
+static const struct of_device_id pdc_wdt_match[] = {
+       { .compatible = "img,pdc-wdt" },
+       {}
+};
+MODULE_DEVICE_TABLE(of, pdc_wdt_match);
+
+static struct platform_driver pdc_wdt_driver = {
+       .driver = {
+               .name = "imgpdc-wdt",
+               .of_match_table = pdc_wdt_match,
+       },
+       .probe = pdc_wdt_probe,
+       .remove = pdc_wdt_remove,
+       .shutdown = pdc_wdt_shutdown,
+};
+module_platform_driver(pdc_wdt_driver);
+
+MODULE_AUTHOR("Jude Abraham <Jude.Abraham@imgtec.com>");
+MODULE_AUTHOR("Naidu Tellapati <Naidu.Tellapati@imgtec.com>");
+MODULE_DESCRIPTION("Imagination Technologies PDC Watchdog Timer Driver");
+MODULE_LICENSE("GPL v2");
index 5142bbabe0279f0b36c92c854f7daa407e2e32a5..5e6d808d358a5c342ae11b9fd71ce5e09416b809 100644 (file)
@@ -205,7 +205,7 @@ static inline void imx2_wdt_ping_if_active(struct watchdog_device *wdog)
        }
 }
 
-static struct watchdog_ops imx2_wdt_ops = {
+static const struct watchdog_ops imx2_wdt_ops = {
        .owner = THIS_MODULE,
        .start = imx2_wdt_start,
        .stop = imx2_wdt_stop,
@@ -213,7 +213,7 @@ static struct watchdog_ops imx2_wdt_ops = {
        .set_timeout = imx2_wdt_set_timeout,
 };
 
-static struct regmap_config imx2_wdt_regmap_config = {
+static const struct regmap_config imx2_wdt_regmap_config = {
        .reg_bits = 16,
        .reg_stride = 2,
        .val_bits = 16,
index 0b93739c0106b17c885a4ef8292681d449851491..e54839b12650a52f22dffe2292ca2268fbef91d7 100644 (file)
@@ -12,8 +12,8 @@
  *                 http://www.ite.com.tw/
  *
  *     Support of the watchdog timers, which are available on
- *     IT8702, IT8712, IT8716, IT8718, IT8720, IT8721, IT8726
- *     and IT8728.
+ *     IT8702, IT8712, IT8716, IT8718, IT8720, IT8721, IT8726,
+ *     IT8728 and IT8783.
  *
  *     This program is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU General Public License
@@ -87,6 +87,7 @@
 #define IT8721_ID      0x8721
 #define IT8726_ID      0x8726  /* the data sheet suggest wrongly 0x8716 */
 #define IT8728_ID      0x8728
+#define IT8783_ID      0x8783
 
 /* GPIO Configuration Registers LDN=0x07 */
 #define WDTCTRL                0x71
@@ -633,6 +634,7 @@ static int __init it87_wdt_init(void)
        case IT8720_ID:
        case IT8721_ID:
        case IT8728_ID:
+       case IT8783_ID:
                max_units = 65535;
                try_gameport = 0;
                break;
index 18e41afa4da38c53e4f0f6bdb55dcbec6ba151d6..4c2cc09c0c5780ec859c8643c65e887bfd3b0b54 100644 (file)
@@ -24,6 +24,7 @@
 #include <linux/clk.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/of.h>
 
 #include <asm/mach-jz4740/timer.h>
 
@@ -142,6 +143,14 @@ static const struct watchdog_ops jz4740_wdt_ops = {
        .set_timeout = jz4740_wdt_set_timeout,
 };
 
+#ifdef CONFIG_OF
+static const struct of_device_id jz4740_wdt_of_matches[] = {
+       { .compatible = "ingenic,jz4740-watchdog", },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, jz4740_wdt_of_matches)
+#endif
+
 static int jz4740_wdt_probe(struct platform_device *pdev)
 {
        struct jz4740_wdt_drvdata *drvdata;
@@ -211,6 +220,7 @@ static struct platform_driver jz4740_wdt_driver = {
        .remove = jz4740_wdt_remove,
        .driver = {
                .name = "jz4740-wdt",
+               .of_match_table = of_match_ptr(jz4740_wdt_of_matches),
        },
 };
 
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
new file mode 100644 (file)
index 0000000..a87f6df
--- /dev/null
@@ -0,0 +1,251 @@
+/*
+ * Mediatek Watchdog Driver
+ *
+ * Copyright (C) 2014 Matthias Brugger
+ *
+ * Matthias Brugger <matthias.bgg@gmail.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Based on sunxi_wdt.c
+ */
+
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/types.h>
+#include <linux/watchdog.h>
+#include <linux/notifier.h>
+#include <linux/reboot.h>
+#include <linux/delay.h>
+
+#define WDT_MAX_TIMEOUT                31
+#define WDT_MIN_TIMEOUT                1
+#define WDT_LENGTH_TIMEOUT(n)  ((n) << 5)
+
+#define WDT_LENGTH             0x04
+#define WDT_LENGTH_KEY         0x8
+
+#define WDT_RST                        0x08
+#define WDT_RST_RELOAD         0x1971
+
+#define WDT_MODE               0x00
+#define WDT_MODE_EN            (1 << 0)
+#define WDT_MODE_EXT_POL_LOW   (0 << 1)
+#define WDT_MODE_EXT_POL_HIGH  (1 << 1)
+#define WDT_MODE_EXRST_EN      (1 << 2)
+#define WDT_MODE_IRQ_EN                (1 << 3)
+#define WDT_MODE_AUTO_START    (1 << 4)
+#define WDT_MODE_DUAL_EN       (1 << 6)
+#define WDT_MODE_KEY           0x22000000
+
+#define WDT_SWRST              0x14
+#define WDT_SWRST_KEY          0x1209
+
+#define DRV_NAME               "mtk-wdt"
+#define DRV_VERSION            "1.0"
+
+static bool nowayout = WATCHDOG_NOWAYOUT;
+static unsigned int timeout = WDT_MAX_TIMEOUT;
+
+struct mtk_wdt_dev {
+       struct watchdog_device wdt_dev;
+       void __iomem *wdt_base;
+       struct notifier_block restart_handler;
+};
+
+static int mtk_reset_handler(struct notifier_block *this, unsigned long mode,
+                               void *cmd)
+{
+       struct mtk_wdt_dev *mtk_wdt;
+       void __iomem *wdt_base;
+
+       mtk_wdt = container_of(this, struct mtk_wdt_dev, restart_handler);
+       wdt_base = mtk_wdt->wdt_base;
+
+       while (1) {
+               writel(WDT_SWRST_KEY, wdt_base + WDT_SWRST);
+               mdelay(5);
+       }
+
+       return NOTIFY_DONE;
+}
+
+static int mtk_wdt_ping(struct watchdog_device *wdt_dev)
+{
+       struct mtk_wdt_dev *mtk_wdt = watchdog_get_drvdata(wdt_dev);
+       void __iomem *wdt_base = mtk_wdt->wdt_base;
+
+       iowrite32(WDT_RST_RELOAD, wdt_base + WDT_RST);
+
+       return 0;
+}
+
+static int mtk_wdt_set_timeout(struct watchdog_device *wdt_dev,
+                               unsigned int timeout)
+{
+       struct mtk_wdt_dev *mtk_wdt = watchdog_get_drvdata(wdt_dev);
+       void __iomem *wdt_base = mtk_wdt->wdt_base;
+       u32 reg;
+
+       wdt_dev->timeout = timeout;
+
+       /*
+        * One bit is the value of 512 ticks
+        * The clock has 32 KHz
+        */
+       reg = WDT_LENGTH_TIMEOUT(timeout << 6) | WDT_LENGTH_KEY;
+       iowrite32(reg, wdt_base + WDT_LENGTH);
+
+       mtk_wdt_ping(wdt_dev);
+
+       return 0;
+}
+
+static int mtk_wdt_stop(struct watchdog_device *wdt_dev)
+{
+       struct mtk_wdt_dev *mtk_wdt = watchdog_get_drvdata(wdt_dev);
+       void __iomem *wdt_base = mtk_wdt->wdt_base;
+       u32 reg;
+
+       reg = readl(wdt_base + WDT_MODE);
+       reg &= ~WDT_MODE_EN;
+       iowrite32(reg, wdt_base + WDT_MODE);
+
+       return 0;
+}
+
+static int mtk_wdt_start(struct watchdog_device *wdt_dev)
+{
+       u32 reg;
+       struct mtk_wdt_dev *mtk_wdt = watchdog_get_drvdata(wdt_dev);
+       void __iomem *wdt_base = mtk_wdt->wdt_base;
+       u32 ret;
+
+       ret = mtk_wdt_set_timeout(wdt_dev, wdt_dev->timeout);
+       if (ret < 0)
+               return ret;
+
+       reg = ioread32(wdt_base + WDT_MODE);
+       reg &= ~(WDT_MODE_IRQ_EN | WDT_MODE_DUAL_EN);
+       reg |= (WDT_MODE_EN | WDT_MODE_KEY);
+       iowrite32(reg, wdt_base + WDT_MODE);
+
+       return 0;
+}
+
+static const struct watchdog_info mtk_wdt_info = {
+       .identity       = DRV_NAME,
+       .options        = WDIOF_SETTIMEOUT |
+                         WDIOF_KEEPALIVEPING |
+                         WDIOF_MAGICCLOSE,
+};
+
+static const struct watchdog_ops mtk_wdt_ops = {
+       .owner          = THIS_MODULE,
+       .start          = mtk_wdt_start,
+       .stop           = mtk_wdt_stop,
+       .ping           = mtk_wdt_ping,
+       .set_timeout    = mtk_wdt_set_timeout,
+};
+
+static int mtk_wdt_probe(struct platform_device *pdev)
+{
+       struct mtk_wdt_dev *mtk_wdt;
+       struct resource *res;
+       int err;
+
+       mtk_wdt = devm_kzalloc(&pdev->dev, sizeof(*mtk_wdt), GFP_KERNEL);
+       if (!mtk_wdt)
+               return -ENOMEM;
+
+       platform_set_drvdata(pdev, mtk_wdt);
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       mtk_wdt->wdt_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(mtk_wdt->wdt_base))
+               return PTR_ERR(mtk_wdt->wdt_base);
+
+       mtk_wdt->wdt_dev.info = &mtk_wdt_info;
+       mtk_wdt->wdt_dev.ops = &mtk_wdt_ops;
+       mtk_wdt->wdt_dev.timeout = WDT_MAX_TIMEOUT;
+       mtk_wdt->wdt_dev.max_timeout = WDT_MAX_TIMEOUT;
+       mtk_wdt->wdt_dev.min_timeout = WDT_MIN_TIMEOUT;
+       mtk_wdt->wdt_dev.parent = &pdev->dev;
+
+       watchdog_init_timeout(&mtk_wdt->wdt_dev, timeout, &pdev->dev);
+       watchdog_set_nowayout(&mtk_wdt->wdt_dev, nowayout);
+
+       watchdog_set_drvdata(&mtk_wdt->wdt_dev, mtk_wdt);
+
+       mtk_wdt_stop(&mtk_wdt->wdt_dev);
+
+       err = watchdog_register_device(&mtk_wdt->wdt_dev);
+       if (unlikely(err))
+               return err;
+
+       mtk_wdt->restart_handler.notifier_call = mtk_reset_handler;
+       mtk_wdt->restart_handler.priority = 128;
+       err = register_restart_handler(&mtk_wdt->restart_handler);
+       if (err)
+               dev_warn(&pdev->dev,
+                       "cannot register restart handler (err=%d)\n", err);
+
+       dev_info(&pdev->dev, "Watchdog enabled (timeout=%d sec, nowayout=%d)\n",
+                       mtk_wdt->wdt_dev.timeout, nowayout);
+
+       return 0;
+}
+
+static int mtk_wdt_remove(struct platform_device *pdev)
+{
+       struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);
+
+       unregister_restart_handler(&mtk_wdt->restart_handler);
+
+       watchdog_unregister_device(&mtk_wdt->wdt_dev);
+
+       return 0;
+}
+
+static const struct of_device_id mtk_wdt_dt_ids[] = {
+       { .compatible = "mediatek,mt6589-wdt" },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids);
+
+static struct platform_driver mtk_wdt_driver = {
+       .probe          = mtk_wdt_probe,
+       .remove         = mtk_wdt_remove,
+       .driver         = {
+               .name           = DRV_NAME,
+               .of_match_table = mtk_wdt_dt_ids,
+       },
+};
+
+module_platform_driver(mtk_wdt_driver);
+
+module_param(timeout, uint, 0);
+MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds");
+
+module_param(nowayout, bool, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
+                       __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Matthias Brugger <matthias.bgg@gmail.com>");
+MODULE_DESCRIPTION("Mediatek WatchDog Timer Driver");
+MODULE_VERSION(DRV_VERSION);
index 9f2709db61ca921ac1a97ff055735fcf7612349f..1e6be9e405779884c315de023a8aad18e5c07419 100644 (file)
@@ -189,7 +189,7 @@ static int omap_wdt_set_timeout(struct watchdog_device *wdog,
 }
 
 static const struct watchdog_info omap_wdt_info = {
-       .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+       .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
        .identity = "OMAP Watchdog",
 };
 
index a7a0695971e468e19142645b7bdca8be38671bb4..b7c68e275aeb357503b3e10e48b2102444348b92 100644 (file)
@@ -94,7 +94,7 @@ static int retu_wdt_set_timeout(struct watchdog_device *wdog,
 }
 
 static const struct watchdog_info retu_wdt_info = {
-       .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+       .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
        .identity = "Retu watchdog",
 };
 
index 11aad5b7aafe8fe3122f61d99d347723381a3148..a6f7e2e29bebbdb201952e5a14fa268e3cc4b1f1 100644 (file)
@@ -45,6 +45,7 @@
 static struct clk *rt288x_wdt_clk;
 static unsigned long rt288x_wdt_freq;
 static void __iomem *rt288x_wdt_base;
+static struct reset_control *rt288x_wdt_reset;
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
@@ -151,16 +152,18 @@ static int rt288x_wdt_probe(struct platform_device *pdev)
        if (IS_ERR(rt288x_wdt_clk))
                return PTR_ERR(rt288x_wdt_clk);
 
-       device_reset(&pdev->dev);
+       rt288x_wdt_reset = devm_reset_control_get(&pdev->dev, NULL);
+       if (!IS_ERR(rt288x_wdt_reset))
+               reset_control_deassert(rt288x_wdt_reset);
 
        rt288x_wdt_freq = clk_get_rate(rt288x_wdt_clk) / RALINK_WDT_PRESCALE;
 
        rt288x_wdt_dev.dev = &pdev->dev;
        rt288x_wdt_dev.bootstatus = rt288x_wdt_bootcause();
-
        rt288x_wdt_dev.max_timeout = (0xfffful / rt288x_wdt_freq);
-       rt288x_wdt_dev.timeout = rt288x_wdt_dev.max_timeout;
 
+       watchdog_init_timeout(&rt288x_wdt_dev, rt288x_wdt_dev.max_timeout,
+                             &pdev->dev);
        watchdog_set_nowayout(&rt288x_wdt_dev, nowayout);
 
        ret = watchdog_register_device(&rt288x_wdt_dev);
index 12c15903d0989d4b3bc14dfcd83943e8d549e703..2c1db6fa9a2724ae906f8682dd29ea176a752daf 100644 (file)
@@ -57,7 +57,7 @@ static int twl4030_wdt_set_timeout(struct watchdog_device *wdt,
 }
 
 static const struct watchdog_info twl4030_wdt_info = {
-       .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+       .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
        .identity = "TWL4030 Watchdog",
 };
 
index 7165704a3e33e2e4fdd034562492122baf990ff2..5824e25eebbbab1c60e35070a20f93f92f979d6f 100644 (file)
@@ -50,7 +50,7 @@ static int cr_wdt_control;    /* WDT control register */
 
 enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
             w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
-            w83667hg_b, nct6775, nct6776, nct6779 };
+            w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
 
 static int timeout;                    /* in seconds */
 module_param(timeout, int, 0);
@@ -95,6 +95,8 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
 #define NCT6775_ID             0xb4
 #define NCT6776_ID             0xc3
 #define NCT6779_ID             0xc5
+#define NCT6791_ID             0xc8
+#define NCT6792_ID             0xc9
 
 #define W83627HF_WDT_TIMEOUT   0xf6
 #define W83697HF_WDT_TIMEOUT   0xf4
@@ -195,6 +197,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
        case nct6775:
        case nct6776:
        case nct6779:
+       case nct6791:
+       case nct6792:
                /*
                 * These chips have a fixed WDTO# output pin (W83627UHG),
                 * or support more than one WDTO# output pin.
@@ -395,6 +399,12 @@ static int wdt_find(int addr)
        case NCT6779_ID:
                ret = nct6779;
                break;
+       case NCT6791_ID:
+               ret = nct6791;
+               break;
+       case NCT6792_ID:
+               ret = nct6792;
+               break;
        case 0xff:
                ret = -ENODEV;
                break;
@@ -428,6 +438,8 @@ static int __init wdt_init(void)
                "NCT6775",
                "NCT6776",
                "NCT6779",
+               "NCT6791",
+               "NCT6792",
        };
 
        wdt_io = 0x2e;
index b708786d4cbf6d374bdff697eac61e623d427723..5582c211f594e03d188a56631446ec94016d9fc0 100644 (file)
@@ -16,6 +16,7 @@ struct bcm47xx_wdt {
 
        struct watchdog_device wdd;
        struct notifier_block notifier;
+       struct notifier_block restart_handler;
 
        struct timer_list soft_timer;
        atomic_t soft_ticks;