From: Jerry Hoemann <jerry.hoemann@hpe.com>
To: Joel Stanley <joel@jms.id.au>
Cc: linux-arm-kernel@lists.infradead.org,
"Ryan Chen" <ryan_chen@aspeedtech.com>,
linux-watchdog@vger.kernel.org, linux-aspeed@lists.ozlabs.org,
"Andrew Jeffery" <andrew@aj.id.au>,
linux-kernel@vger.kernel.org, "Cédric Le Goater" <clg@kaod.org>,
"Wim Van Sebroeck" <wim@linux-watchdog.org>,
"Guenter Roeck" <linux@roeck-us.net>
Subject: Re: [PATCH] watchdog: aspeed: Fix clock behaviour for ast2600
Date: Fri, 8 Nov 2019 11:05:17 -0700 [thread overview]
Message-ID: <20191108180517.GB150483@anatevka.americas.hpqcorp.net> (raw)
In-Reply-To: <20191108032905.22463-1-joel@jms.id.au>
On Fri, Nov 08, 2019 at 01:59:05PM +1030, Joel Stanley wrote:
> The ast2600 no longer uses bit 4 in the control register to indicate a
> 1MHz clock (It now controls weather this watchdog is reset by a SOC
> reset). This means we do not want to set it. It also does not need to be
> set for the ast2500, as it is read-only on that SoC.
s/weather/whether/
>
> The comment next to the clock rate selection wandered away from where it
> was set, so put it back next to the register setting it's describing.
>
> Fixes: b3528b487448 ("watchdog: aspeed: Add support for AST2600")
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
> drivers/watchdog/aspeed_wdt.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
> index 4ec0906bf12c..7e00960651fa 100644
> --- a/drivers/watchdog/aspeed_wdt.c
> +++ b/drivers/watchdog/aspeed_wdt.c
> @@ -258,11 +258,6 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
> if (IS_ERR(wdt->base))
> return PTR_ERR(wdt->base);
>
> - /*
> - * The ast2400 wdt can run at PCLK, or 1MHz. The ast2500 only
> - * runs at 1MHz. We chose to always run at 1MHz, as there's no
> - * good reason to have a faster watchdog counter.
> - */
> wdt->wdd.info = &aspeed_wdt_info;
> wdt->wdd.ops = &aspeed_wdt_ops;
> wdt->wdd.max_hw_heartbeat_ms = WDT_MAX_TIMEOUT_MS;
> @@ -278,7 +273,16 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
> return -EINVAL;
> config = ofdid->data;
>
> - wdt->ctrl = WDT_CTRL_1MHZ_CLK;
> + /*
> + * On clock rates:
> + * - ast2400 wdt can run at PCLK, or 1MHz
> + * - ast2500 only runs at 1MHz, hard coding bit 4 to 1
> + * - ast2600 always runs at 1MHz
> + *
> + * Set the ast2400 to run at 1MHz as it simplifies the driver.
> + */
> + if (of_device_is_compatible(np, "aspeed,ast2400-wdt"))
> + wdt->ctrl = WDT_CTRL_1MHZ_CLK;
>
> /*
> * Control reset on a per-device basis to ensure the
> --
> 2.24.0.rc1
--
-----------------------------------------------------------------------------
Jerry Hoemann Software Engineer Hewlett Packard Enterprise
-----------------------------------------------------------------------------
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2019-11-08 18:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 3:29 [PATCH] watchdog: aspeed: Fix clock behaviour for ast2600 Joel Stanley
2019-11-08 7:57 ` Cédric Le Goater
2019-11-08 14:25 ` Guenter Roeck
2019-11-08 18:05 ` Jerry Hoemann [this message]
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=20191108180517.GB150483@anatevka.americas.hpqcorp.net \
--to=jerry.hoemann@hpe.com \
--cc=andrew@aj.id.au \
--cc=clg@kaod.org \
--cc=joel@jms.id.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=ryan_chen@aspeedtech.com \
--cc=wim@linux-watchdog.org \
/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).