Merge remote-tracking branches 'spi/fix/bcm63xx', 'spi/fix/doc', 'spi/fix/mediatek...

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 79e1aa1b0959f1ed8b2e2404fc3a044683c68f0d..1c427beffadd97b3e95522fc9236193006d58fcc 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -446,7 +446,7 @@ config MAX63XX_WATCHDOG
 
 config IMX2_WDT
        tristate "IMX2+ Watchdog"
-       depends on ARCH_MXC
+       depends on ARCH_MXC || ARCH_LAYERSCAPE
        select REGMAP_MMIO
        select WATCHDOG_CORE
        help
@@ -1313,6 +1313,14 @@ config BCM_KONA_WDT_DEBUG
 
          If in doubt, say 'N'.
 
+config BCM7038_WDT
+       tristate "BCM7038 Watchdog"
+       select WATCHDOG_CORE
+       help
+        Watchdog driver for the built-in hardware in Broadcom 7038 SoCs.
+
+        Say 'Y or 'M' here to enable the driver.
+
 config IMGPDC_WDT
        tristate "Imagination Technologies PDC Watchdog Timer"
        depends on HAS_IOMEM