Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[safe/jmp/linux-2.6] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 32b9fe1..0e8468f 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -55,6 +55,20 @@ config SOFT_WATCHDOG
          To compile this driver as a module, choose M here: the
          module will be called softdog.
 
          To compile this driver as a module, choose M here: the
          module will be called softdog.
 

+config WM831X_WATCHDOG
+       tristate "WM831x watchdog"
+       depends on MFD_WM831X
+       help
+         Support for the watchdog in the WM831x AudioPlus PMICs.  When
+         the watchdog triggers the system will be reset.
+
+config WM8350_WATCHDOG
+       tristate "WM8350 watchdog"
+       depends on MFD_WM8350
+       help
+         Support for the watchdog in the WM8350 AudioPlus PMIC.  When
+         the watchdog triggers the system will be reset.
+

 # ALPHA Architecture
 
 # ARM Architecture
 # ALPHA Architecture
 
 # ARM Architecture


@@ -66,6 +80,13 @@ config AT91RM9200_WATCHDOG
          Watchdog timer embedded into AT91RM9200 chips. This will reboot your
          system when the timeout is reached.
 
          Watchdog timer embedded into AT91RM9200 chips. This will reboot your
          system when the timeout is reached.
 

+config AT91SAM9X_WATCHDOG
+       tristate "AT91SAM9X / AT91CAP9 watchdog"
+       depends on ARCH_AT91 && !ARCH_AT91RM9200
+       help
+         Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
+         reboot your system when the timeout is reached.
+

 config 21285_WATCHDOG
        tristate "DC21285 watchdog"
        depends on FOOTBRIDGE
 config 21285_WATCHDOG
        tristate "DC21285 watchdog"
        depends on FOOTBRIDGE


@@ -173,10 +194,10 @@ config EP93XX_WATCHDOG
 
 config OMAP_WATCHDOG
        tristate "OMAP Watchdog"
 
 config OMAP_WATCHDOG
        tristate "OMAP Watchdog"

-       depends on ARCH_OMAP16XX || ARCH_OMAP24XX
+       depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP3

        help
        help

-         Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog.  Say 'Y' here to
-         enable the OMAP1610/OMAP1710 watchdog timer.
+         Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog.  Say 'Y'
+         here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog timer.

 
 config PNX4008_WATCHDOG
        tristate "PNX4008 Watchdog"
 
 config PNX4008_WATCHDOG
        tristate "PNX4008 Watchdog"


@@ -217,7 +238,73 @@ config DAVINCI_WATCHDOG
          NOTE: once enabled, this timer cannot be disabled.
          Say N if you are unsure.
 
          NOTE: once enabled, this timer cannot be disabled.
          Say N if you are unsure.
 

-# ARM26 Architecture
+config ORION_WATCHDOG
+       tristate "Orion watchdog"
+       depends on ARCH_ORION5X || ARCH_KIRKWOOD
+       help
+         Say Y here if to include support for the watchdog timer
+         in the Marvell Orion5x and Kirkwood ARM SoCs.
+         To compile this driver as a module, choose M here: the
+         module will be called orion_wdt.
+
+config COH901327_WATCHDOG
+       bool "ST-Ericsson COH 901 327 watchdog"
+       depends on ARCH_U300
+       default y if MACH_U300
+       help
+         Say Y here to include Watchdog timer support for the
+         watchdog embedded into the ST-Ericsson U300 series platforms.
+         This watchdog is used to reset the system and thus cannot be
+         compiled as a module.
+
+config TWL4030_WATCHDOG
+       tristate "TWL4030 Watchdog"
+       depends on TWL4030_CORE
+       help
+         Support for TI TWL4030 watchdog.  Say 'Y' here to enable the
+         watchdog timer support for TWL4030 chips.
+
+config STMP3XXX_WATCHDOG
+       tristate "Freescale STMP3XXX watchdog"
+       depends on ARCH_STMP3XXX
+       help
+         Say Y here if to include support for the watchdog timer
+         for the Sigmatel STMP37XX/378X SoC.
+         To compile this driver as a module, choose M here: the
+         module will be called stmp3xxx_wdt.
+
+config NUC900_WATCHDOG
+       tristate "Nuvoton NUC900 watchdog"
+       depends on ARCH_W90X900
+       help
+         Say Y here if to include support for the watchdog timer
+         for the Nuvoton NUC900 series SoCs.
+         To compile this driver as a module, choose M here: the
+         module will be called nuc900_wdt.
+
+config ADX_WATCHDOG
+       tristate "Avionic Design Xanthos watchdog"
+       depends on ARCH_PXA_ADX
+       help
+         Say Y here if you want support for the watchdog timer on Avionic
+         Design Xanthos boards.
+
+config TS72XX_WATCHDOG
+       tristate "TS-72XX SBC Watchdog"
+       depends on MACH_TS72XX
+       help
+         Technologic Systems TS-7200, TS-7250 and TS-7260 boards have
+         watchdog timer implemented in a external CPLD chip. Say Y here
+         if you want to support for the watchdog timer on TS-72XX boards.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ts72xx_wdt.
+
+config MAX63XX_WATCHDOG
+       tristate "Max63xx watchdog"
+       depends on ARM
+       help
+         Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.

 
 # AVR32 Architecture
 
 
 # AVR32 Architecture
 


@@ -285,10 +372,11 @@ config ALIM1535_WDT
 
 config ALIM7101_WDT
        tristate "ALi M7101 PMU Computer Watchdog"
 
 config ALIM7101_WDT
        tristate "ALi M7101 PMU Computer Watchdog"

-       depends on X86 && PCI
+       depends on PCI

        help
          This is the driver for the hardware watchdog on the ALi M7101 PMU
        help
          This is the driver for the hardware watchdog on the ALi M7101 PMU

-         as used in the x86 Cobalt servers.
+         as used in the x86 Cobalt servers and also found in some
+         SPARC Netra servers too.

 
          To compile this driver as a module, choose M here: the
          module will be called alim7101_wdt.
 
          To compile this driver as a module, choose M here: the
          module will be called alim7101_wdt.


@@ -297,7 +385,7 @@ config ALIM7101_WDT
 
 config GEODE_WDT
        tristate "AMD Geode CS5535/CS5536 Watchdog"
 
 config GEODE_WDT
        tristate "AMD Geode CS5535/CS5536 Watchdog"

-       depends on MGEODE_LX
+       depends on CS5535_MFGPT

        help
          This driver enables a watchdog capability built into the
          CS5535/CS5536 companion chips for the AMD Geode GX and LX
        help
          This driver enables a watchdog capability built into the
          CS5535/CS5536 companion chips for the AMD Geode GX and LX


@@ -321,6 +409,28 @@ config SC520_WDT
          You can compile this driver directly into the kernel, or use
          it as a module.  The module will be called sc520_wdt.
 
          You can compile this driver directly into the kernel, or use
          it as a module.  The module will be called sc520_wdt.
 

+config SBC_FITPC2_WATCHDOG
+       tristate "Compulab SBC-FITPC2 watchdog"
+       depends on X86
+       ---help---
+         This is the driver for the built-in watchdog timer on the fit-PC2,
+         fit-PC2i, CM-iAM single-board computers made by Compulab.
+
+         It`s possible to enable watchdog timer either from BIOS (F2) or from booted Linux.
+         When "Watchdog Timer Value" enabled one can set 31-255 s operational range.
+
+         Entering BIOS setup temporary disables watchdog operation regardless to current state,
+         so system will not be restarted while user in BIOS setup.
+
+         Once watchdog was enabled the system will be restarted every
+         "Watchdog Timer Value" period, so to prevent it user can restart or
+         disable the watchdog.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sbc_fitpc2_wdt.
+
+         Most people will say N.
+

 config EUROTECH_WDT
        tristate "Eurotech CPU-1220/1410 Watchdog Timer"
        depends on X86
 config EUROTECH_WDT
        tristate "Eurotech CPU-1220/1410 Watchdog Timer"
        depends on X86


@@ -382,7 +492,7 @@ config ITCO_WDT
        ---help---
          Hardware driver for the intel TCO timer based watchdog devices.
          These drivers are included in the Intel 82801 I/O Controller
        ---help---
          Hardware driver for the intel TCO timer based watchdog devices.
          These drivers are included in the Intel 82801 I/O Controller

-         Hub family (from ICH0 up to ICH8) and in the Intel 6300ESB
+         Hub family (from ICH0 up to ICH10) and in the Intel 63xxESB

          controller hub.
 
          The TCO (Total Cost of Ownership) timer is a watchdog timer
          controller hub.
 
          The TCO (Total Cost of Ownership) timer is a watchdog timer


@@ -415,6 +525,18 @@ config IT8712F_WDT
          To compile this driver as a module, choose M here: the
          module will be called it8712f_wdt.
 
          To compile this driver as a module, choose M here: the
          module will be called it8712f_wdt.
 

+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.
+
+         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"
        depends on X86
 config HP_WATCHDOG
        tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
        depends on X86


@@ -464,6 +586,16 @@ config PC87413_WDT
 
          Most people will say N.
 
 
          Most people will say N.
 

+config RDC321X_WDT
+       tristate "RDC R-321x SoC watchdog"
+       depends on X86_RDC321X
+       help
+         This is the driver for the built in hardware watchdog
+         in the RDC R-321x SoC.
+
+         To compile this driver as a module, choose M here: the
+         module will be called rdc321x_wdt.
+

 config 60XX_WDT
        tristate "SBC-60XX Watchdog Timer"
        depends on X86
 config 60XX_WDT
        tristate "SBC-60XX Watchdog Timer"
        depends on X86


@@ -487,7 +619,7 @@ config SBC8360_WDT
          Board Computer produced by Axiomtek Co., Ltd. (www.axiomtek.com).
 
          To compile this driver as a module, choose M here: the
          Board Computer produced by Axiomtek Co., Ltd. (www.axiomtek.com).
 
          To compile this driver as a module, choose M here: the

-         module will be called sbc8360.ko.
+         module will be called sbc8360.

 
          Most people will say N.
 
 
          Most people will say N.
 


@@ -512,6 +644,18 @@ config CPU5_WDT
          To compile this driver as a module, choose M here: the
          module will be called cpu5wdt.
 
          To compile this driver as a module, choose M here: the
          module will be called cpu5wdt.
 

+config SMSC_SCH311X_WDT
+       tristate "SMSC SCH311X Watchdog Timer"
+       depends on X86
+       ---help---
+         This is the driver for the hardware watchdog timer on the
+         SMSC SCH3112, SCH3114 and SCH3116 Super IO chipset
+         (LPC IO with 8042 KBC, Reset Generation, HWM and multiple
+         serial ports).
+
+         To compile this driver as a module, choose M here: the
+         module will be called sch311x_wdt.
+

 config SMSC37B787_WDT
        tristate "Winbond SMsC37B787 Watchdog Timer"
        depends on X86
 config SMSC37B787_WDT
        tristate "Winbond SMsC37B787 Watchdog Timer"
        depends on X86


@@ -562,6 +706,21 @@ config W83697HF_WDT
 
          Most people will say N.
 
 
          Most people will say N.
 

+config W83697UG_WDT
+       tristate "W83697UG/W83697UF Watchdog Timer"
+       depends on X86
+       ---help---
+         This is the driver for the hardware watchdog on the W83697UG/UF
+         chipset as used in MSI Fuzzy CX700 VIA 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.
+
+         To compile this driver as a module, choose M here: the
+         module will be called w83697ug_wdt.
+
+         Most people will say N.
+

 config W83877F_WDT
        tristate "W83877F (EMACS) Watchdog Timer"
        depends on X86
 config W83877F_WDT
        tristate "W83877F (EMACS) Watchdog Timer"
        depends on X86


@@ -632,6 +791,22 @@ config SBC_EPX_C3_WATCHDOG
 
 # MIPS Architecture
 
 
 # MIPS Architecture
 

+config BCM47XX_WDT
+       tristate "Broadcom BCM47xx Watchdog Timer"
+       depends on BCM47XX
+       help
+         Hardware driver for the Broadcom BCM47xx Watchog Timer.
+
+config RC32434_WDT
+       tristate "IDT RC32434 SoC Watchdog Timer"
+       depends on MIKROTIK_RB532
+       help
+         Hardware driver for the IDT RC32434 SoC built-in
+         watchdog timer.
+
+         To compile this driver as a module, choose M here: the
+         module will be called rc32434_wdt.
+

 config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
        depends on SGI_HAS_INDYDOG
 config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
        depends on SGI_HAS_INDYDOG


@@ -648,15 +823,14 @@ config WDT_MTX1
          Hardware driver for the MTX-1 boards. This is a watchdog timer that
          will reboot the machine after a 100 seconds timer expired.
 
          Hardware driver for the MTX-1 boards. This is a watchdog timer that
          will reboot the machine after a 100 seconds timer expired.
 

-config WDT_RM9K_GPI
-       tristate "RM9000/GPI hardware watchdog"
-       depends on CPU_RM9000
+config PNX833X_WDT
+       tristate "PNX833x Hardware Watchdog"
+       depends on SOC_PNX8335

        help
        help

-         Watchdog implementation using the GPI hardware found on
-         PMC-Sierra RM9xxx CPUs.
-
-         To compile this driver as a module, choose M here: the
-         module will be called rm9k_wdt.
+         Hardware driver for the PNX833x's watchdog. This is a
+         watchdog timer that will reboot the machine after a programable
+         timer has expired and no process has written to /dev/watchdog during
+         that time.

 
 config SIBYTE_WDOG
        tristate "Sibyte SoC hardware watchdog"
 
 config SIBYTE_WDOG
        tristate "Sibyte SoC hardware watchdog"


@@ -687,13 +861,17 @@ config TXX9_WDT
 
 # POWERPC Architecture
 
 
 # POWERPC Architecture
 

+config GEF_WDT
+       tristate "GE Watchdog Timer"
+       depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A
+       ---help---
+         Watchdog timer found in a number of GE single board computers.
+

 config MPC5200_WDT
 config MPC5200_WDT

-       tristate "MPC5200 Watchdog Timer"
+       bool "MPC52xx Watchdog Timer"

        depends on PPC_MPC52xx
        depends on PPC_MPC52xx

-
-config 8xx_WDT
-       tristate "MPC8xx Watchdog Timer"
-       depends on 8xx
+       help
+         Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog.

 
 config 8xxx_WDT
        tristate "MPC8xxx Platform Watchdog Timer"
 
 config 8xxx_WDT
        tristate "MPC8xxx Platform Watchdog Timer"


@@ -711,6 +889,14 @@ config MV64X60_WDT
        tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
        depends on MV64X60
 
        tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
        depends on MV64X60
 

+config PIKA_WDT
+       tristate "PIKA FPGA Watchdog"
+       depends on WARP
+       default y
+       help
+         This enables the watchdog in the PIKA FPGA. Currently used on
+         the Warp platform.
+

 config BOOKE_WDT
        bool "PowerPC Book-E Watchdog Timer"
        depends on BOOKE || 4xx
 config BOOKE_WDT
        bool "PowerPC Book-E Watchdog Timer"
        depends on BOOKE || 4xx


@@ -847,21 +1033,6 @@ config WDT
          To compile this driver as a module, choose M here: the
          module will be called wdt.
 
          To compile this driver as a module, choose M here: the
          module will be called wdt.
 

-config WDT_501
-       bool "WDT501 features"
-       depends on WDT
-       help
-         Saying Y here and creating a character special file /dev/temperature
-         with major number 10 and minor number 131 ("man mknod") will give
-         you a thermometer inside your computer: reading from
-         /dev/temperature yields one byte, the temperature in degrees
-         Fahrenheit. This works only if you have a WDT501P watchdog board
-         installed.
-
-         If you want to enable the Fan Tachometer on the WDT501P, then you
-         can do this via the tachometer parameter. Only do this if you have a
-         fan tachometer actually set up.
-

 #
 # PCI-based Watchdog Cards
 #
 #
 # PCI-based Watchdog Cards
 #


@@ -890,24 +1061,16 @@ config WDTPCI
        ---help---
          If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
 
        ---help---
          If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
 

-         To compile this driver as a module, choose M here: the
-         module will be called wdt_pci.
-
-config WDT_501_PCI
-       bool "PCI-WDT501 features"
-       depends on WDTPCI
-       help
-         Saying Y here and creating a character special file /dev/temperature
-         with major number 10 and minor number 131 ("man mknod") will give
-         you a thermometer inside your computer: reading from
-         /dev/temperature yields one byte, the temperature in degrees
-         Fahrenheit. This works only if you have a PCI-WDT501 watchdog board
-         installed.
+         If you have a PCI-WDT501 watchdog board then you can enable the
+         temperature sensor by setting the type parameter to 501.

 
          If you want to enable the Fan Tachometer on the PCI-WDT501, then you
          can do this via the tachometer parameter. Only do this if you have a
          fan tachometer actually set up.
 
 
          If you want to enable the Fan Tachometer on the PCI-WDT501, then you
          can do this via the tachometer parameter. Only do this if you have a
          fan tachometer actually set up.
 

+         To compile this driver as a module, choose M here: the
+         module will be called wdt_pci.
+

 #
 # USB-based Watchdog Cards
 #
 #
 # USB-based Watchdog Cards
 #