Merge branch 'master' of git://git.denx.de/u-boot-tegra

[u-boot] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b911233db3d8cb8a0e4c90c1f8c48a9e9fb3de35..148c6a0d687cc147d44659edf47d7a69f446cd5c 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1,5 +1,13 @@
 menu "Watchdog Timer Support"
 
+config WATCHDOG
+       bool "Enable U-Boot watchdog reset"
+       help
+         This option enables U-Boot watchdog support where U-Boot is using
+         watchdog_reset function to service watchdog device in U-Boot. Enable
+         this option if you want to service enabled watchdog by U-Boot. Disable
+         this option if you want U-Boot to start watchdog but never service it.
+
 config HW_WATCHDOG
        bool
 
@@ -19,7 +27,16 @@ config OMAP_WATCHDOG
        default y if AM33XX
        help
          Say Y here to enable the OMAP3+ watchdog driver.
-       
+
+config TANGIER_WATCHDOG
+       bool "Intel Tangier watchdog"
+       depends on INTEL_MID
+       select HW_WATCHDOG
+       help
+         This enables support for watchdog controller available on
+         Intel Tangier SoC. If you're using a board with Intel Tangier
+         SoC, say Y here.
+
 config ULP_WATCHDOG
        bool "i.MX7ULP watchdog"
        help
@@ -39,9 +56,18 @@ config WDT_SANDBOX
        bool "Enable Watchdog Timer support for Sandbox"
        depends on SANDBOX && WDT
        help
-               Enable Watchdog Timer support in Sandbox. This is a dummy device that
-               can be probed and supports all of the methods of WDT, but does not
-               really do anything.
+         Enable Watchdog Timer support in Sandbox. This is a dummy device that
+         can be probed and supports all of the methods of WDT, but does not
+         really do anything.
+
+config WDT_ARMADA_37XX
+       bool "Marvell Armada 37xx watchdog timer support"
+       depends on WDT && ARMADA_3700
+       help
+          Enable this to support Watchdog Timer on Marvell Armada 37xx SoC.
+          There are 4 possible clocks which can be used on these SoCs. This
+          driver uses the second clock (ID 1), assuming that so will also
+          Linux's driver.
 
 config WDT_ASPEED
        bool "Aspeed ast2400/ast2500 watchdog timer support"
@@ -62,4 +88,19 @@ config WDT_BCM6345
          The watchdog timer is stopped when initialized.
          It performs full SoC reset.
 
+config WDT_ORION
+       bool "Orion watchdog timer support"
+       depends on WDT
+       help
+          Select this to enable Orion watchdog timer, which can be found on some
+          Marvell Armada chips.
+
+config WDT_CDNS
+       bool "Cadence watchdog timer support"
+       depends on WDT
+       imply WATCHDOG
+       help
+          Select this to enable Cadence watchdog timer, which can be found on some
+          Xilinx Microzed Platform.
+
 endmenu