From: Guenter Roeck <linux@roeck-us.net>
To: Wolfram Sang <wsa+renesas@sang-engineering.com>,
linux-watchdog@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
Support Opensource <support.opensource@diasemi.com>
Subject: Re: [PATCH RFT] watchdog: da9063_wdt: parse DT for timeout value, too
Date: Sun, 14 Apr 2019 07:52:14 -0700 [thread overview]
Message-ID: <9fcd483c-07ae-b89d-d244-82151d03a433@roeck-us.net> (raw)
In-Reply-To: <20190414110933.30529-1-wsa+renesas@sang-engineering.com>
On 4/14/19 4:09 AM, Wolfram Sang wrote:
> And make sure the final obtained value gets properly scaled. Remove two
> empty lines to group the initialization blocks while we are here.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
>
> Tested with a Renesas Lager board (R-Car H2, DA9063AD), checking the initial
> timeout value via sysfs. I didn't test handover from bootloader because my
> bootloader neither supports WDT or I2C out of the box.
>
> drivers/watchdog/da9063_wdt.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/watchdog/da9063_wdt.c b/drivers/watchdog/da9063_wdt.c
> index 06eb9070203c..3d65e92a4e3f 100644
> --- a/drivers/watchdog/da9063_wdt.c
> +++ b/drivers/watchdog/da9063_wdt.c
> @@ -208,18 +208,20 @@ static int da9063_wdt_probe(struct platform_device *pdev)
> wdd->min_timeout = DA9063_WDT_MIN_TIMEOUT;
> wdd->max_timeout = DA9063_WDT_MAX_TIMEOUT;
> wdd->min_hw_heartbeat_ms = DA9063_RESET_PROTECTION_MS;
> - wdd->timeout = DA9063_WDG_TIMEOUT;
> wdd->parent = dev;
> -
> wdd->status = WATCHDOG_NOWAYOUT_INIT_STATUS;
>
> watchdog_set_restart_priority(wdd, 128);
> -
> watchdog_set_drvdata(wdd, da9063);
>
> + /* Set default timeout, maybe override it with DT value, scale it */
> + wdd->timeout = DA9063_WDG_TIMEOUT;
> + watchdog_init_timeout(wdd, 0, dev);
> + da9063_wdt_set_timeout(wdd, wdd->timeout);
> +
> /* Change the timeout to the default value if the watchdog is running */
> if (da9063_wdt_is_running(da9063)) {
> - da9063_wdt_update_timeout(da9063, DA9063_WDG_TIMEOUT);
> + da9063_wdt_update_timeout(da9063, wdd->timeout);
> set_bit(WDOG_HW_RUNNING, &wdd->status);
> }
>
>
next prev parent reply other threads:[~2019-04-14 14:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-14 11:09 [PATCH RFT] watchdog: da9063_wdt: parse DT for timeout value, too Wolfram Sang
2019-04-14 14:52 ` Guenter Roeck [this message]
2019-04-16 10:21 ` Steve Twiss
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=9fcd483c-07ae-b89d-d244-82151d03a433@roeck-us.net \
--to=linux@roeck-us.net \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=support.opensource@diasemi.com \
--cc=wsa+renesas@sang-engineering.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).