Merge tag 'stable/for-linus-3.12-rc0-tag-two' of git://git.kernel.org/pub/scm/linux...

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 6042e9ed542c90ba03c70c590a4de38703c4ebc5..362085d7ad8fc1787f234039ecb4b9620237657b 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -282,7 +282,7 @@ config DAVINCI_WATCHDOG
 
 config ORION_WATCHDOG
        tristate "Orion watchdog"
-       depends on ARCH_ORION5X || ARCH_KIRKWOOD
+       depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE
        select WATCHDOG_CORE
        help
          Say Y here if to include support for the watchdog timer
@@ -1074,7 +1074,7 @@ config TXX9_WDT
 
 config OCTEON_WDT
        tristate "Cavium OCTEON SOC family Watchdog Timer"
-       depends on CPU_CAVIUM_OCTEON
+       depends on CAVIUM_OCTEON_SOC
        default y
        select EXPORT_UASM if OCTEON_WDT = m
        help
@@ -1100,6 +1100,17 @@ config BCM63XX_WDT
          To compile this driver as a loadable module, choose M here.
          The module will be called bcm63xx_wdt.
 
+config BCM2835_WDT
+       tristate "Broadcom BCM2835 hardware watchdog"
+       depends on ARCH_BCM2835
+       select WATCHDOG_CORE
+       help
+         Watchdog driver for the built in watchdog hardware in Broadcom
+         BCM2835 SoC.
+
+         To compile this driver as a loadable module, choose M here.
+         The module will be called bcm2835_wdt.
+
 config LANTIQ_WDT
        tristate "Lantiq SoC watchdog"
        depends on LANTIQ
@@ -1174,6 +1185,18 @@ config BOOKE_WDT_DEFAULT_TIMEOUT
 
          The value can be overridden by the wdt_period command-line parameter.
 
+config MEN_A21_WDT
+       tristate "MEN A21 VME CPU Carrier Board Watchdog Timer"
+       select WATCHDOG_CORE
+       depends on GPIOLIB
+       help
+        Watchdog driver for MEN A21 VMEbus CPU Carrier Boards.
+
+       The driver can also be built as a module. If so, the module will be
+       called mena21_wdt.
+
+       If unsure select N here.
+
 # PPC64 Architecture
 
 config WATCHDOG_RTAS