Merge tag 'linux-watchdog-5.1-rc1' of git://www.linux-watchdog.org/linux-watchdog

[sfrench/cifs-2.6.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 57f017d74a976de975303c4a8b639c150fb6e084..242eea8596373e21fc677a9004f55641034ab6fd 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -241,6 +241,22 @@ config RAVE_SP_WATCHDOG
        help
          Support for the watchdog on RAVE SP device.
 
+config MLX_WDT
+       tristate "Mellanox Watchdog"
+       depends on MELLANOX_PLATFORM
+       select WATCHDOG_CORE
+       select REGMAP
+       help
+         This is the driver for the hardware watchdog on Mellanox systems.
+         If you are going to use it, say Y here, otherwise N.
+         This driver can be used together with the watchdog daemon.
+         It can also watch your kernel to make sure it doesn't freeze,
+         and if it does, it reboots your system after a certain amount of
+         time.
+
+         To compile this driver as a module, choose M here: the
+         module will be called mlx-wdt.
+
 # ALPHA Architecture
 
 # ARM Architecture
@@ -817,6 +833,18 @@ config STM32_WATCHDOG
          To compile this driver as a module, choose M here: the
          module will be called stm32_iwdg.
 
+config STPMIC1_WATCHDOG
+       tristate "STPMIC1 PMIC watchdog support"
+       depends on MFD_STPMIC1
+       select WATCHDOG_CORE
+       help
+         Say Y here to include watchdog support embedded into STPMIC1 PMIC.
+         If the watchdog timer expires, stpmic1 will shut down all its power
+         supplies.
+
+         To compile this driver as a module, choose M here: the
+         module will be called spmic1_wdt.
+
 config UNIPHIER_WATCHDOG
        tristate "UniPhier watchdog support"
        depends on ARCH_UNIPHIER || COMPILE_TEST
@@ -1145,7 +1173,7 @@ config HP_WATCHDOG
        select WATCHDOG_CORE
        depends on X86 && PCI
        help
-         A software monitoring watchdog and NMI sourcing driver. This driver
+         A software monitoring watchdog and NMI handling driver. This driver
          will detect lockups and provide a stack trace. This is a driver that
          will only load on an HP ProLiant system with a minimum of iLO2 support.
          To compile this driver as a module, choose M here: the module will be
@@ -1163,12 +1191,13 @@ config KEMPLD_WDT
          called kempld_wdt.
 
 config HPWDT_NMI_DECODING
-       bool "NMI decoding support for the HP ProLiant iLO2+ Hardware Watchdog Timer"
+       bool "NMI support for the HP ProLiant iLO2+ Hardware Watchdog Timer"
        depends on HP_WATCHDOG
        default y
        help
-         When an NMI occurs this feature will make the necessary BIOS calls to
-         log the cause of the NMI.
+         Enables the NMI handler for the watchdog pretimeout NMI and the iLO
+         "Generate NMI to System" virtual button.  When an NMI is claimed
+         by the driver, panic is called.
 
 config SC1200_WDT
        tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"