Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 9536d386bb38ea890a9d5fa78921b5f0bb9fa46a..2b3e49609d7018f99dc02443b8e600fe119dde58 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -73,6 +73,31 @@ config WM8350_WATCHDOG
 
 # ARM Architecture
 
+config RK29_WATCHDOG
+       tristate "RK29 watchdog"
+       depends on ARCH_RK29
+       help
+         Watchdog timer embedded into RK29xx chips. This will reboot your
+         system when the timeout is reached.
+
+config RK29_FEED_DOG_BY_INTE
+       bool "feed watchdog by interrupt"
+       depends on RK29_WATCHDOG
+
+config RK29_WATCHDOG_ATBOOT
+       bool "start watchdog at system boot"
+       depends on RK29_WATCHDOG
+
+config RK29_WATCHDOG_DEFAULT_TIME
+       int "set watchdog time out value (unit second)"
+       depends on RK29_WATCHDOG
+       help
+         the real time out value is two times more than the setting value
+
+config RK29_WATCHDOG_DEBUG
+       bool "enable watchdog debug"
+       depends on RK29_WATCHDOG
+
 config ARM_SP805_WATCHDOG
        tristate "ARM SP805 Watchdog"
        depends on ARM_AMBA
@@ -599,8 +624,7 @@ config IT87_WDT
 
 config HP_WATCHDOG
        tristate "HP ProLiant iLO2+ Hardware Watchdog Timer"
-       depends on X86
-       default m
+       depends on X86 && PCI
        help
          A software monitoring watchdog and NMI sourcing driver. This driver
          will detect lockups and provide a stack trace. This is a driver that