From: Marco Felsch <m.felsch@pengutronix.de>
To: Guenter Roeck <linux@roeck-us.net>
Cc: support.opensource@diasemi.com, robh+dt@kernel.org,
lee.jones@linaro.org, stwiss.opensource@diasemi.com,
Adam.Thomson.Opensource@diasemi.com,
linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel@pengutronix.de
Subject: Re: [PATCH 3/3] watchdog: da9062: add power management ops
Date: Thu, 6 Feb 2020 10:00:10 +0100 [thread overview]
Message-ID: <20200206090010.ya6p2kvab452kedr@pengutronix.de> (raw)
In-Reply-To: <20200123205132.GA13377@roeck-us.net>
Hi Guenter,
On 20-01-23 12:51, Guenter Roeck wrote:
> On Wed, Jan 08, 2020 at 10:57:04AM +0100, Marco Felsch wrote:
> > Disable the watchdog during suspend if it is enabled and re-enable it on
> > resume. So we can sleep without the interruptions.
> >
> > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> > Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
I got an kbuild email so I checked the linux-next master tree. On
linux-next this patch isn't used instead the old v1 was used...
Regards,
Marco
> > ---
> > v2:
> > - add dlg,use-sw-pm check to differentiate between automatic and manual
> > disabling/enabling.
> > ---
> > drivers/watchdog/da9062_wdt.c | 37 +++++++++++++++++++++++++++++++++++
> > 1 file changed, 37 insertions(+)
> >
> > diff --git a/drivers/watchdog/da9062_wdt.c b/drivers/watchdog/da9062_wdt.c
> > index e149e66a6ea9..c9b9d6394525 100644
> > --- a/drivers/watchdog/da9062_wdt.c
> > +++ b/drivers/watchdog/da9062_wdt.c
> > @@ -15,6 +15,7 @@
> > #include <linux/jiffies.h>
> > #include <linux/mfd/da9062/registers.h>
> > #include <linux/mfd/da9062/core.h>
> > +#include <linux/property.h>
> > #include <linux/regmap.h>
> > #include <linux/of.h>
> >
> > @@ -30,6 +31,7 @@ static const unsigned int wdt_timeout[] = { 0, 2, 4, 8, 16, 32, 65, 131 };
> > struct da9062_watchdog {
> > struct da9062 *hw;
> > struct watchdog_device wdtdev;
> > + bool use_sw_pm;
> > };
> >
> > static unsigned int da9062_wdt_timeout_to_sel(unsigned int secs)
> > @@ -198,6 +200,8 @@ static int da9062_wdt_probe(struct platform_device *pdev)
> > if (!wdt)
> > return -ENOMEM;
> >
> > + wdt->use_sw_pm = device_property_present(dev, "dlg,use-sw-pm");
> > +
> > wdt->hw = chip;
> >
> > wdt->wdtdev.info = &da9062_watchdog_info;
> > @@ -212,6 +216,7 @@ static int da9062_wdt_probe(struct platform_device *pdev)
> > watchdog_set_restart_priority(&wdt->wdtdev, 128);
> >
> > watchdog_set_drvdata(&wdt->wdtdev, wdt);
> > + dev_set_drvdata(dev, &wdt->wdtdev);
> >
> > ret = devm_watchdog_register_device(dev, &wdt->wdtdev);
> > if (ret < 0)
> > @@ -220,10 +225,42 @@ static int da9062_wdt_probe(struct platform_device *pdev)
> > return da9062_wdt_ping(&wdt->wdtdev);
> > }
> >
> > +static int __maybe_unused da9062_wdt_suspend(struct device *dev)
> > +{
> > + struct watchdog_device *wdd = dev_get_drvdata(dev);
> > + struct da9062_watchdog *wdt = watchdog_get_drvdata(wdd);
> > +
> > + if (!wdt->use_sw_pm)
> > + return 0;
> > +
> > + if (watchdog_active(wdd))
> > + return da9062_wdt_stop(wdd);
> > +
> > + return 0;
> > +}
> > +
> > +static int __maybe_unused da9062_wdt_resume(struct device *dev)
> > +{
> > + struct watchdog_device *wdd = dev_get_drvdata(dev);
> > + struct da9062_watchdog *wdt = watchdog_get_drvdata(wdd);
> > +
> > + if (!wdt->use_sw_pm)
> > + return 0;
> > +
> > + if (watchdog_active(wdd))
> > + return da9062_wdt_start(wdd);
> > +
> > + return 0;
> > +}
> > +
> > +static SIMPLE_DEV_PM_OPS(da9062_wdt_pm_ops,
> > + da9062_wdt_suspend, da9062_wdt_resume);
> > +
> > static struct platform_driver da9062_wdt_driver = {
> > .probe = da9062_wdt_probe,
> > .driver = {
> > .name = "da9062-watchdog",
> > + .pm = &da9062_wdt_pm_ops,
> > .of_match_table = da9062_compatible_id_table,
> > },
> > };
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2020-02-06 9:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 9:57 [PATCH 0/3] Explicit disable da9062 watchdog during suspend Marco Felsch
2020-01-08 9:57 ` [PATCH 1/3] mfd: da9062: fix watchdog compatible string Marco Felsch
2020-01-11 16:47 ` Guenter Roeck
2020-01-14 16:19 ` Adam Thomson
2020-01-14 16:23 ` Marco Felsch
2020-01-14 16:28 ` Adam Thomson
2020-01-16 13:35 ` Lee Jones
2020-01-08 9:57 ` [PATCH 2/3] dt-bindings: watchdog: da9062: add suspend disable option Marco Felsch
2020-01-14 16:20 ` Adam Thomson
2020-01-15 1:43 ` Rob Herring
2020-01-23 20:50 ` Guenter Roeck
2020-01-08 9:57 ` [PATCH 3/3] watchdog: da9062: add power management ops Marco Felsch
2020-01-14 16:24 ` Adam Thomson
2020-01-23 20:51 ` Guenter Roeck
2020-02-06 9:00 ` Marco Felsch [this message]
2020-02-06 14:28 ` Guenter Roeck
2020-02-06 14:45 ` Guenter Roeck
2020-02-07 6:51 ` Marco Felsch
2020-01-08 10:09 ` [PATCH 0/3] Explicit disable da9062 watchdog during suspend Marco Felsch
2020-02-07 6:47 ` Marco Felsch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200206090010.ya6p2kvab452kedr@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=Adam.Thomson.Opensource@diasemi.com \
--cc=devicetree@vger.kernel.org \
--cc=kernel@pengutronix.de \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=robh+dt@kernel.org \
--cc=stwiss.opensource@diasemi.com \
--cc=support.opensource@diasemi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).