| Message ID | a978b8d0511748e4558f5169896da44c742a49f3.1392212059.git.michal.simek@xilinx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/22/2014 10:44 AM, Wim Van Sebroeck wrote: > Hi Michal, > >> Enable this driver for Zynq. >> Move it to architecture independent Kconfig part. >> >> Signed-off-by: Michal Simek <michal.simek@xilinx.com> >> Reviewed-by: Guenter Roeck <linux@roeck-us.net> >> --- >> >> Changes in v3: None >> Changes in v2: None >> >> Build tested by zero day testing system. >> --- >> drivers/watchdog/Kconfig | 22 +++++++++------------- >> 1 file changed, 9 insertions(+), 13 deletions(-) >> >> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig >> index 9db5d3c..6120403 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 >> @@ -1022,19 +1031,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 >> -- >> 1.8.2.3 >> > > Are we sure that we don't need an additional dependancy (like depends on HAS_IOMEM) to not have issues with other architectures? > Hi Wim, Doesn't look like it. I have the series in my build test and did not see any failures because of it. See http://server.roeck-us.net:8010/builders, branch watchdog-next. Which reminds me that I wanted to reparent the branch to 3.14-rc3. I just did that; you should be able to see build results in a couple of hours. Guenter
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 9db5d3c..6120403 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 @@ -1022,19 +1031,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