From: Michal Simek Date: Wed, 12 Feb 2014 13:41:24 +0000 (+0100) Subject: watchdog: xilinx: Enable this driver for Zynq X-Git-Tag: v3.15-rc1~146^2~15 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c9dcf9f2ea3d64602fe6230daba80f2ed811535b;p=~emulex%2Finfiniband.git watchdog: xilinx: Enable this driver for Zynq Enable this driver for Zynq. Move it to architecture independent Kconfig part. Signed-off-by: Michal Simek Reviewed-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck --- diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 82ffa0fbbfa..4b54a0faa16 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -111,6 +111,15 @@ config WM8350_WATCHDOG Support for the watchdog in the WM8350 AudioPlus PMIC. When the watchdog triggers the system will be reset. +config XILINX_WATCHDOG + tristate "Xilinx Watchdog timer" + select WATCHDOG_CORE + help + Watchdog driver for the xps_timebase_wdt ip core. + + To compile this driver as a module, choose M here: the + module will be called of_xilinx_wdt. + # ALPHA Architecture # ARM Architecture @@ -1023,19 +1032,6 @@ config M54xx_WATCHDOG # MicroBlaze Architecture -config XILINX_WATCHDOG - tristate "Xilinx Watchdog timer" - depends on MICROBLAZE - select WATCHDOG_CORE - ---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