1 files changed, 35 insertions, 1 deletions

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 21d816e9dfa5..f441726ddf2b 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -28,6 +28,17 @@ menuconfig WATCHDOG
 
 if WATCHDOG
 
+config WATCHDOG_CORE
+        bool "WatchDog Timer Driver Core"
+        ---help---
+          Say Y here if you want to use the new watchdog timer driver core.
+          This driver provides a framework for all watchdog timer drivers
+          and gives them the /dev/watchdog interface (and later also the
+          sysfs interface).
+
+          To compile this driver as a module, choose M here: the module will
+          be called watchdog.
+
 config WATCHDOG_NOWAYOUT
         bool "Disable watchdog shutdown on close"
         help
@@ -186,6 +197,15 @@ config SA1100_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called sa1100_wdt.
 
+config DW_WATCHDOG
+        tristate "Synopsys DesignWare watchdog"
+        depends on ARM && HAVE_CLK
+        help
+          Say Y here if to include support for the Synopsys DesignWare
+          watchdog timer found in many ARM chips.
+          To compile this driver as a module, choose M here: the
+          module will be called dw_wdt.
+
 config MPCORE_WATCHDOG
         tristate "MPcore watchdog"
         depends on HAVE_ARM_TWD
@@ -321,7 +341,7 @@ config MAX63XX_WATCHDOG
 
 config IMX2_WDT
         tristate "IMX2+ Watchdog"
-        depends on ARCH_MX2 || ARCH_MX25 || ARCH_MX3 || ARCH_MX5
+        depends on IMX_HAVE_PLATFORM_IMX2_WDT
         help
           This is the driver for the hardware watchdog
           on the Freescale IMX2 and later processors.
@@ -879,6 +899,20 @@ config M54xx_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called m54xx_wdt.
 
+# MicroBlaze Architecture
+
+config XILINX_WATCHDOG
+        tristate "Xilinx Watchdog timer"
+        depends on MICROBLAZE
+        ---help---
+          Watchdog driver for the xps_timebase_wdt ip core.
+
+          IMPORTANT: The xps_timebase_wdt parent must have the property
+          "clock-frequency" at device tree.
+
+          To compile this driver as a module, choose M here: the
+          module will be called of_xilinx_wdt.
+
 # MIPS Architecture
 
 config ATH79_WDT