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 0542314e1510588a6ba6aa8642839510ef6804b5..d92d7488be16677a6436e7224ebaaaf1c087fe57 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -540,6 +540,19 @@ config I6300ESB_WDT
          To compile this driver as a module, choose M here: the
          module will be called i6300esb.
 
          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
 config INTEL_SCU_WATCHDOG
        bool "Intel SCU Watchdog for Mobile Platforms"
        depends on X86_MRST


@@ -552,6 +565,7 @@ config INTEL_SCU_WATCHDOG
 config ITCO_WDT
        tristate "Intel TCO Timer/Watchdog"
        depends on (X86 || IA64) && PCI
 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
        ---help---
          Hardware driver for the intel TCO timer based watchdog devices.
          These drivers are included in the Intel 82801 I/O Controller


@@ -596,7 +610,12 @@ config IT87_WDT
        depends on X86 && EXPERIMENTAL
        ---help---
          This is the driver for the hardware watchdog on the ITE IT8702,
        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.
          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.


@@ -769,7 +788,7 @@ config SMSC37B787_WDT
 
 config VIA_WDT
        tristate "VIA Watchdog Timer"
 
 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
        select WATCHDOG_CORE
        ---help---
        This is the driver for the hardware watchdog timer on VIA


@@ -1127,6 +1146,7 @@ config ZVM_WATCHDOG
 config SH_WDT
        tristate "SuperH Watchdog"
        depends on SUPERH && (CPU_SH3 || CPU_SH4)
 config SH_WDT
        tristate "SuperH Watchdog"
        depends on SUPERH && (CPU_SH3 || CPU_SH4)

+       select WATCHDOG_CORE

        help
          This driver adds watchdog support for the integrated watchdog in the
          SuperH processors. If you have one of these processors and wish
        help
          This driver adds watchdog support for the integrated watchdog in the
          SuperH processors. If you have one of these processors and wish