On Wed, Mar 15, 2017 at 07:17:01PM +0100, Michael Tretter wrote: > The DA9063 watchdog always resets the system when systemd changes the > timeout value after Barebox already set a timeout value. > > If the watchdog is disabled before setting a new timeout, the system is > not reset and the watchdog is still enabled. > > This patch is based on a previous patch by Philipp Zabel [1], but does > not wait for 150 us, because the DA9063 does not require a delay after > disabling the watchdog. > > [1] https://www.spinics.net/lists/linux-watchdog/msg07143.html > > Signed-off-by: Michael Tretter <m.tretter@xxxxxxxxxxxxxx> > --- > drivers/watchdog/da9063_wdt.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/watchdog/da9063_wdt.c b/drivers/watchdog/da9063_wdt.c > index 4691c5509129..fcdc12d14d03 100644 > --- a/drivers/watchdog/da9063_wdt.c > +++ b/drivers/watchdog/da9063_wdt.c > @@ -55,8 +55,19 @@ static unsigned int da9063_wdt_timeout_to_sel(unsigned int secs) > > static int _da9063_wdt_set_timeout(struct da9063 *da9063, unsigned int regval) > { > - return regmap_update_bits(da9063->regmap, DA9063_REG_CONTROL_D, > - DA9063_TWDSCALE_MASK, regval); > + int ret; > + > + ret = regmap_update_bits(da9063->regmap, DA9063_REG_CONTROL_D, > + DA9063_TWDSCALE_MASK, DA9063_TWDSCALE_DISABLE); > + if (ret) > + dev_warn(da9063->dev, > + "Failed to disable watchdog before setting new timeout\n"); > + > + if (regval) Why this if() ? Even if needed (and I think it isn't), this would be an unrelated change. On a side note, unless I am missing something, da9063_wdt_set_timeout() unconditionally enables the watchdog as a side effect. It should not do that. Guenter > + ret = regmap_update_bits(da9063->regmap, DA9063_REG_CONTROL_D, > + DA9063_TWDSCALE_MASK, regval); > + > + return ret; > } > > static int da9063_wdt_start(struct watchdog_device *wdd) > -- > 2.11.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
