1 files changed, 159 insertions, 24 deletions

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 8828d8ffd353..faa9127aecaa 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -73,6 +73,13 @@ config WM8350_WATCHDOG
 
 # ARM Architecture
 
+config ARM_SP805_WATCHDOG
+        tristate "ARM SP805 Watchdog"
+        depends on ARM_AMBA
+        help
+          ARM Primecell SP805 Watchdog timer. This will reboot your system when
+          the timeout is reached.
+
 config AT91RM9200_WATCHDOG
         tristate "AT91RM9200 watchdog"
         depends on ARCH_AT91RM9200
@@ -145,13 +152,19 @@ config KS8695_WATCHDOG
           Watchdog timer embedded into KS8695 processor. This will reboot your
           system when the timeout is reached.
 
+config HAVE_S3C2410_WATCHDOG
+        bool
+        help
+          This will include watchdog timer support for Samsung SoCs. If
+          you want to include watchdog support for any machine, kindly
+          select this in the respective mach-XXXX/Kconfig file.
+
 config S3C2410_WATCHDOG
         tristate "S3C2410 Watchdog"
-        depends on ARCH_S3C2410
+        depends on ARCH_S3C2410 || HAVE_S3C2410_WATCHDOG
         help
-          Watchdog timer block in the Samsung S3C2410 chips. This will
-          reboot the system when the timer expires with the watchdog
-          enabled.
+          Watchdog timer block in the Samsung SoCs. This will reboot
+          the system when the timer expires with the watchdog enabled.
 
           The driver is limited by the speed of the system's PCLK
           signal, so with reasonably fast systems (PCLK around 50-66MHz)
@@ -200,11 +213,11 @@ config OMAP_WATCHDOG
           here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog timer.
 
 config PNX4008_WATCHDOG
-        tristate "PNX4008 Watchdog"
-        depends on ARCH_PNX4008
+        tristate "PNX4008 and LPC32XX Watchdog"
+        depends on ARCH_PNX4008 || ARCH_LPC32XX
         help
           Say Y here if to include support for the watchdog timer
-          in the PNX4008 processor.
+          in the PNX4008 or LPC32XX processor.
           This driver can be built as a module by choosing M. The module
           will be called pnx4008_wdt.
 
@@ -306,6 +319,18 @@ config MAX63XX_WATCHDOG
         help
           Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.
 
+config IMX2_WDT
+        tristate "IMX2+ Watchdog"
+        depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3 || ARCH_MX5
+        help
+          This is the driver for the hardware watchdog
+          on the Freescale IMX2 and later processors.
+          If you have one of these processors and wish to have
+          watchdog support enabled, say Y, otherwise say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called imx2_wdt.
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT
@@ -383,6 +408,28 @@ config ALIM7101_WDT
 
           Most people will say N.
 
+config F71808E_WDT
+        tristate "Fintek F71808E, F71862FG, F71869, F71882FG and F71889FG Watchdog"
+        depends on X86 && EXPERIMENTAL
+        help
+          This is the driver for the hardware watchdog on the Fintek
+          F71808E, F71862FG, F71869, F71882FG and F71889FG Super I/O controllers.
+
+          You can compile this driver directly into the kernel, or use
+          it as a module.  The module will be called f71808e_wdt.
+
+config SP5100_TCO
+        tristate "AMD/ATI SP5100 TCO Timer/Watchdog"
+        depends on X86 && PCI
+        ---help---
+          Hardware watchdog driver for the AMD/ATI SP5100 chipset. The TCO
+          (Total Cost of Ownership) timer is a watchdog timer that will reboot
+          the machine after its expiration. The expiration time can be
+          configured with the "heartbeat" parameter.
+
+          To compile this driver as a module, choose M here: the
+          module will be called sp5100_tco.
+
 config GEODE_WDT
         tristate "AMD Geode CS5535/CS5536 Watchdog"
         depends on CS5535_MFGPT
@@ -522,6 +569,9 @@ config IT8712F_WDT
           This is the driver for the built-in watchdog timer on the IT8712F
           Super I/0 chipset used on many motherboards.
 
+          If the driver does not work, then make sure that the game port in
+          the BIOS is enabled.
+
           To compile this driver as a module, choose M here: the
           module will be called it8712f_wdt.
 
@@ -529,25 +579,31 @@ config IT87_WDT
         tristate "IT87 Watchdog Timer"
         depends on X86 && EXPERIMENTAL
         ---help---
-          This is the driver for the hardware watchdog on the ITE IT8716,
-          IT8718, IT8726, IT8712(Version J,K) Super I/O chips. This watchdog
-          simply watches your kernel to make sure it doesn't freeze, and if
-          it does, it reboots your computer after a certain amount of time.
+          This is the driver for the hardware watchdog on the ITE IT8702,
+          IT8712, IT8716, IT8718, IT8720, IT8726, IT8712 Super I/O chips.
+          This watchdog simply watches your kernel to make sure it doesn't
+          freeze, and if it does, it reboots your computer after a certain
+          amount of time.
 
           To compile this driver as a module, choose M here: the module will
           be called it87_wdt.
 
 config HP_WATCHDOG
-        tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
+        tristate "HP Proliant iLO2+ Hardware Watchdog Timer"
         depends on X86
         help
           A software monitoring watchdog and NMI sourcing driver. This driver
-          will detect lockups and provide stack trace. Also, when an NMI
-          occurs this driver will make the necessary BIOS calls to log
-          the cause of the NMI. This is a driver that will only load on a
-          HP ProLiant system with a minimum of iLO2 support.
-          To compile this driver as a module, choose M here: the
-          module will be called hpwdt.
+          will detect lockups and provide a stack trace. This is a driver that
+          will only load on a HP ProLiant system with a minimum of iLO2 support.
+          To compile this driver as a module, choose M here: the module will be
+          called hpwdt.
+
+config HPWDT_NMI_DECODING
+        bool "NMI decoding support for the HP ProLiant iLO2+ Hardware Watchdog Timer"
+        depends on HP_WATCHDOG
+        help
+          When an NMI occurs this feature will make the necessary BIOS calls to
+          log the cause of the NMI.
 
 config SC1200_WDT
         tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
@@ -586,6 +642,24 @@ config PC87413_WDT
 
           Most people will say N.
 
+config NV_TCO
+        tristate "nVidia TCO Timer/Watchdog"
+        depends on X86 && PCI
+        ---help---
+          Hardware driver for the TCO timer built into the nVidia Hub family
+          (such as the MCP51).  The TCO (Total Cost of Ownership) timer is a
+          watchdog timer that will reboot the machine after its second
+          expiration. The expiration time can be configured with the
+          "heartbeat" parameter.
+
+          On some motherboards the driver may fail to reset the chipset's
+          NO_REBOOT flag which prevents the watchdog from rebooting the
+          machine. If this is the case you will get a kernel message like
+          "failed to reset NO_REBOOT flag, reboot disabled by hardware".
+
+          To compile this driver as a module, choose M here: the
+          module will be called nv_tco.
+
 config RDC321X_WDT
         tristate "RDC R-321x SoC watchdog"
         depends on X86_RDC321X
@@ -677,14 +751,15 @@ config SMSC37B787_WDT
           Most people will say N.
 
 config W83627HF_WDT
-        tristate "W83627HF Watchdog Timer"
+        tristate "W83627HF/W83627DHG Watchdog Timer"
         depends on X86
         ---help---
           This is the driver for the hardware watchdog on the W83627HF chipset
           as used in Advantech PC-9578 and Tyan S2721-533 motherboards
-          (and likely others).  This watchdog simply watches your kernel to
-          make sure it doesn't freeze, and if it does, it reboots your computer
-          after a certain amount of time.
+          (and likely others). The driver also supports the W83627DHG chip.
+          This watchdog simply watches your kernel to make sure it doesn't
+          freeze, and if it does, it reboots your computer after a certain
+          amount of time.
 
           To compile this driver as a module, choose M here: the
           module will be called w83627hf_wdt.
@@ -787,10 +862,22 @@ config SBC_EPX_C3_WATCHDOG
 
 # M68K Architecture
 
-# M68KNOMMU Architecture
+config M548x_WATCHDOG
+        tristate "MCF548x watchdog support"
+        depends on M548x
+        help
+          To compile this driver as a module, choose M here: the
+          module will be called m548x_wdt.
 
 # MIPS Architecture
 
+config ATH79_WDT
+        tristate "Atheros AR71XX/AR724X/AR913X hardware watchdog"
+        depends on ATH79
+        help
+          Hardware driver for the built-in watchdog timer on the Atheros
+          AR71XX/AR724X/AR913X SoCs.
+
 config BCM47XX_WDT
         tristate "Broadcom BCM47xx Watchdog Timer"
         depends on BCM47XX
@@ -857,6 +944,34 @@ config TXX9_WDT
         help
           Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
 
+config OCTEON_WDT
+        tristate "Cavium OCTEON SOC family Watchdog Timer"
+        depends on CPU_CAVIUM_OCTEON
+        default y
+        select EXPORT_UASM if OCTEON_WDT = m
+        help
+          Hardware driver for OCTEON's on chip watchdog timer.
+          Enables the watchdog for all cores running Linux. It
+          installs a NMI handler and pokes the watchdog based on an
+          interrupt.  On first expiration of the watchdog, the
+          interrupt handler pokes it.  The second expiration causes an
+          NMI that prints a message. The third expiration causes a
+          global soft reset.
+
+          When userspace has /dev/watchdog open, no poking is done
+          from the first interrupt, it is then only poked when the
+          device is written.
+
+config BCM63XX_WDT
+        tristate "Broadcom BCM63xx hardware watchdog"
+        depends on BCM63XX
+        help
+          Watchdog driver for the built in watchdog hardware in Broadcom
+          BCM63xx SoC.
+
+          To compile this driver as a loadable module, choose M here.
+          The module will be called bcm63xx_wdt.
+
 # PARISC Architecture
 
 # POWERPC Architecture
@@ -898,12 +1013,32 @@ config PIKA_WDT
           the Warp platform.
 
 config BOOKE_WDT
-        bool "PowerPC Book-E Watchdog Timer"
+        tristate "PowerPC Book-E Watchdog Timer"
         depends on BOOKE || 4xx
         ---help---
+          Watchdog driver for PowerPC Book-E chips, such as the Freescale
+          MPC85xx SOCs and the IBM PowerPC 440.
+
           Please see Documentation/watchdog/watchdog-api.txt for
           more information.
 
+config BOOKE_WDT_DEFAULT_TIMEOUT
+        int "PowerPC Book-E Watchdog Timer Default Timeout"
+        depends on BOOKE_WDT
+        default 38 if FSL_BOOKE
+        range 0 63 if FSL_BOOKE
+        default 3 if !FSL_BOOKE
+        range 0 3 if !FSL_BOOKE
+        help
+          Select the default watchdog timer period to be used by the PowerPC
+          Book-E watchdog driver.  A watchdog "event" occurs when the bit
+          position represented by this number transitions from zero to one.
+
+          For Freescale Book-E processors, this is a number between 0 and 63.
+          For other Book-E processors, this is a number between 0 and 3.
+
+          The value can be overidden by the wdt_period command-line parameter.
+
 # PPC64 Architecture
 
 config WATCHDOG_RTAS