Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 67957393393fc5c80646a677b660266a458015e3..d92d7488be16677a6436e7224ebaaaf1c087fe57 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -129,17 +129,6 @@ config 977_WATCHDOG
 
          Not sure? It's safe to say N.
 
-config IXP2000_WATCHDOG
-       tristate "IXP2000 Watchdog"
-       depends on ARCH_IXP2000
-       help
-         Say Y here if to include support for the watchdog timer
-         in the Intel IXP2000(2400, 2800, 2850) network processors.
-         This driver can be built as a module by choosing M. The module
-         will be called ixp2000_wdt.
-
-         Say N if you are unsure.
-
 config IXP4XX_WATCHDOG
        tristate "IXP4xx Watchdog"
        depends on ARCH_IXP4XX
@@ -543,7 +532,7 @@ config WAFER_WDT
 
 config I6300ESB_WDT
        tristate "Intel 6300ESB Timer/Watchdog"
-       depends on X86 && PCI
+       depends on PCI
        ---help---
          Hardware driver for the watchdog timer built into the Intel
          6300ESB controller hub.
@@ -551,6 +540,19 @@ config I6300ESB_WDT
          To compile this driver as a module, choose M here: the
          module will be called i6300esb.
 
+config IE6XX_WDT
+       tristate "Intel Atom E6xx Watchdog"
+       depends on X86 && PCI
+       select WATCHDOG_CORE
+       select MFD_CORE
+       select LPC_SCH
+       ---help---
+         Hardware driver for the watchdog timer built into the Intel
+         Atom E6XX (TunnelCreek) processor.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ie6xx_wdt.
+
 config INTEL_SCU_WATCHDOG
        bool "Intel SCU Watchdog for Mobile Platforms"
        depends on X86_MRST
@@ -563,6 +565,7 @@ config INTEL_SCU_WATCHDOG
 config ITCO_WDT
        tristate "Intel TCO Timer/Watchdog"
        depends on (X86 || IA64) && PCI
+       select LPC_ICH
        ---help---
          Hardware driver for the intel TCO timer based watchdog devices.
          These drivers are included in the Intel 82801 I/O Controller
@@ -607,7 +610,12 @@ config IT87_WDT
        depends on X86 && EXPERIMENTAL
        ---help---
          This is the driver for the hardware watchdog on the ITE IT8702,
-         IT8712, IT8716, IT8718, IT8720, IT8721, IT8726 Super I/O chips.
+         IT8712, IT8716, IT8718, IT8720, IT8721, IT8726 and IT8728
+         Super I/O chips.
+
+         If the driver does not work, then make sure that the game port in
+         the BIOS is enabled.
+
          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.
@@ -780,7 +788,7 @@ config SMSC37B787_WDT
 
 config VIA_WDT
        tristate "VIA Watchdog Timer"
-       depends on X86
+       depends on X86 && PCI
        select WATCHDOG_CORE
        ---help---
        This is the driver for the hardware watchdog timer on VIA
@@ -937,7 +945,7 @@ config BCM47XX_WDT
        tristate "Broadcom BCM47xx Watchdog Timer"
        depends on BCM47XX
        help
-         Hardware driver for the Broadcom BCM47xx Watchog Timer.
+         Hardware driver for the Broadcom BCM47xx Watchdog Timer.
 
 config RC32434_WDT
        tristate "IDT RC32434 SoC Watchdog Timer"