Merge branch 'cluster' into for-next

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 08f41add146134db9c6975f277b998dee77c70f3..16f20235099768d91f10931841e25176af59ef7e 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -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