Merge tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd

[deliverable/linux.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 262647bbc61449931624821533e887d4b748b18e..241fafde42cb54ceb2e50918e4a02e1c64f4f923 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1,3 +1,4 @@
+
 #
 # Watchdog device configuration
 #
@@ -96,6 +97,15 @@ config DA9063_WATCHDOG
 
          This driver can be built as a module. The module name is da9063_wdt.
 
+config DA9062_WATCHDOG
+       tristate "Dialog DA9062 Watchdog"
+       depends on MFD_DA9062
+       select WATCHDOG_CORE
+       help
+         Support for the watchdog in the DA9062 PMIC.
+
+         This driver can be built as a module. The module name is da9062_wdt.
+
 config GPIO_WATCHDOG
        tristate "Watchdog device controlled through GPIO-line"
        depends on OF_GPIO
@@ -104,6 +114,17 @@ config GPIO_WATCHDOG
          If you say yes here you get support for watchdog device
          controlled through GPIO-line.
 
+config GPIO_WATCHDOG_ARCH_INITCALL
+       bool "Register the watchdog as early as possible"
+       depends on GPIO_WATCHDOG=y
+       help
+         In some situations, the default initcall level (module_init)
+         in not early enough in the boot process to avoid the watchdog
+         to be triggered.
+         If you say yes here, the initcall level would be raised to
+         arch_initcall.
+         If in doubt, say N.
+
 config MENF21BMC_WATCHDOG
        tristate "MEN 14F021P00 BMC Watchdog"
        depends on MFD_MENF21BMC
@@ -169,6 +190,7 @@ config AT91SAM9X_WATCHDOG
 
 config CADENCE_WATCHDOG
        tristate "Cadence Watchdog Timer"
+       depends on HAS_IOMEM
        select WATCHDOG_CORE
        help
          Say Y here if you want to include support for the watchdog
@@ -408,7 +430,7 @@ config TS72XX_WATCHDOG
 
 config MAX63XX_WATCHDOG
        tristate "Max63xx watchdog"
-       depends on ARM && HAS_IOMEM
+       depends on HAS_IOMEM
        select WATCHDOG_CORE
        help
          Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.
@@ -526,6 +548,16 @@ config MEDIATEK_WATCHDOG
          To compile this driver as a module, choose M here: the
          module will be called mtk_wdt.
 
+config DIGICOLOR_WATCHDOG
+       tristate "Conexant Digicolor SoCs watchdog support"
+       depends on ARCH_DIGICOLOR
+       select WATCHDOG_CORE
+       help
+         Say Y here to include support for the watchdog timer
+         in Conexant Digicolor SoCs.
+         To compile this driver as a module, choose M here: the
+         module will be called digicolor_wdt.
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT
@@ -1355,7 +1387,7 @@ config BOOKE_WDT_DEFAULT_TIMEOUT
 config MEN_A21_WDT
        tristate "MEN A21 VME CPU Carrier Board Watchdog Timer"
        select WATCHDOG_CORE
-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST
        help
         Watchdog driver for MEN A21 VMEbus CPU Carrier Boards.