Merge tag 'ttm-fixes-3.14-2014-02-05' of git://people.freedesktop.org/~thomash/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index c11a3387335d69a5668cf6b974ae2907e3aff7e7..4c4c566c52a35c73e582aa27b35fb7821ae69f8a 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -117,7 +117,7 @@ config WM8350_WATCHDOG
 
 config ARM_SP805_WATCHDOG
        tristate "ARM SP805 Watchdog"
-       depends on ARM && ARM_AMBA
+       depends on (ARM || ARM64) && ARM_AMBA
        select WATCHDOG_CORE
        help
          ARM Primecell SP805 Watchdog timer. This will reboot your system when
@@ -223,10 +223,9 @@ config SA1100_WATCHDOG
 
 config DW_WATCHDOG
        tristate "Synopsys DesignWare watchdog"
-       depends on ARM && HAVE_CLK
        help
          Say Y here if to include support for the Synopsys DesignWare
-         watchdog timer found in many ARM chips.
+         watchdog timer found in many chips.
          To compile this driver as a module, choose M here: the
          module will be called dw_wdt.
 
@@ -893,13 +892,22 @@ config VIA_WDT
        Most people will say N.
 
 config W83627HF_WDT
-       tristate "W83627HF/W83627DHG Watchdog Timer"
+       tristate "Watchdog timer for W83627HF/W83627DHG and compatibles"
        depends on X86
        select WATCHDOG_CORE
        ---help---
-         This is the driver for the hardware watchdog on the W83627HF chipset
-         as used in Advantech PC-9578 and Tyan S2721-533 motherboards
-         (and likely others). The driver also supports the W83627DHG chip.
+         This is the driver for the hardware watchdog on the following
+         Super I/O chips.
+               W83627DHG/DHG-P/EHF/EHG/F/G/HF/S/SF/THF/UHG/UG
+               W83637HF
+               W83667HG/HG-B
+               W83687THF
+               W83697HF
+               W83697UG
+               NCT6775
+               NCT6776
+               NCT6779
+
          This watchdog simply watches your kernel to make sure it doesn't
          freeze, and if it does, it reboots your computer after a certain
          amount of time.
@@ -1203,6 +1211,7 @@ config MPC5200_WDT
 config 8xxx_WDT
        tristate "MPC8xxx Platform Watchdog Timer"
        depends on PPC_8xx || PPC_83xx || PPC_86xx
+       select WATCHDOG_CORE
        help
          This driver is for a SoC level watchdog that exists on some
          Freescale PowerPC processors. So far this driver supports: