On Mon, Sep 10, 2012 at 06:44:46PM +0300, Jarkko Nikula wrote: > Convert the twl4030_wdt watchdog driver to watchdog core. > > While at there use devm_kzalloc and set the default timeout in order to be > able test this driver with a simple shell script. > > Signed-off-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxxxxxxxx> > --- > drivers/watchdog/Kconfig | 1 + > drivers/watchdog/twl4030_wdt.c | 183 ++++++++-------------------------------- > 2 files changed, 35 insertions(+), 149 deletions(-) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index 53d7571..21f6205 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -232,6 +232,7 @@ config EP93XX_WATCHDOG > config OMAP_WATCHDOG > tristate "OMAP Watchdog" > depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS > + select WATCHDOG_CORE This should be under TWL4030_WATCHDOG. Otherwise the patch looks good. I briefly tested this with the converted OMAP watchdog driver, and now both drivers can register and co-exist happily on Nokia N9. Great! Tested-by: Aaro Koskinen <aaro.koskinen@xxxxxx> Thanks, A. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html