From: Guenter Roeck <linux@roeck-us.net>
To: "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
Cc: linux-clk@vger.kernel.org, openbmc@lists.ozlabs.org,
linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org,
devicetree@vger.kernel.org,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Avi Fishman <avifishman70@gmail.com>,
Tomer Maimon <tmaimon77@gmail.com>,
Tali Perry <tali.perry1@gmail.com>,
Patrick Venture <venture@google.com>,
Nancy Yuen <yuenn@google.com>,
Benjamin Fair <benjaminfair@google.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Philipp Zabel <p.zabel@pengutronix.de>,
Wim Van Sebroeck <wim@linux-watchdog.org>
Subject: Re: [PATCH v4 2/6] watchdog: npcm: Enable clock if provided
Date: Sun, 25 Sep 2022 10:00:53 -0700 [thread overview]
Message-ID: <20220925170053.GA1761191@roeck-us.net> (raw)
In-Reply-To: <20220610072141.347795-3-j.neuschaefer@gmx.net>
On Fri, Jun 10, 2022 at 09:21:37AM +0200, Jonathan Neuschäfer wrote:
> On the Nuvoton WPCM450 SoC, with its upcoming clock driver, peripheral
> clocks are individually gated and ungated. Therefore, the watchdog
> driver must be able to ungate the watchdog clock.
>
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
>
> v4:
> - Don't disable clock in npcm_wdt_restart function
>
> v3:
> - https://lore.kernel.org/lkml/20220508194333.2170161-4-j.neuschaefer@gmx.net/
> - Add enable/disable calls to npcm_wdt_restart handler
> - Not applied due to the above change: Acked-by: Guenter Roeck <linux@roeck-us.net>
>
> v2:
> - https://lore.kernel.org/lkml/20220429172030.398011-4-j.neuschaefer@gmx.net/
> - Add clk_disable_unprepare call, suggested by Guenter Roeck
>
> v1:
> - https://lore.kernel.org/lkml/20220422183012.444674-4-j.neuschaefer@gmx.net/
> ---
> drivers/watchdog/npcm_wdt.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> --
> 2.35.1
>
> diff --git a/drivers/watchdog/npcm_wdt.c b/drivers/watchdog/npcm_wdt.c
> index 28a24caa2627c..a5dd1c2301374 100644
> --- a/drivers/watchdog/npcm_wdt.c
> +++ b/drivers/watchdog/npcm_wdt.c
> @@ -3,6 +3,7 @@
> // Copyright (c) 2018 IBM Corp.
>
> #include <linux/bitops.h>
> +#include <linux/clk.h>
> #include <linux/delay.h>
> #include <linux/interrupt.h>
> #include <linux/kernel.h>
> @@ -43,6 +44,7 @@
> struct npcm_wdt {
> struct watchdog_device wdd;
> void __iomem *reg;
> + struct clk *clk;
> };
>
> static inline struct npcm_wdt *to_npcm_wdt(struct watchdog_device *wdd)
> @@ -66,6 +68,9 @@ static int npcm_wdt_start(struct watchdog_device *wdd)
> struct npcm_wdt *wdt = to_npcm_wdt(wdd);
> u32 val;
>
> + if (wdt->clk)
> + clk_prepare_enable(wdt->clk);
> +
> if (wdd->timeout < 2)
> val = 0x800;
> else if (wdd->timeout < 3)
> @@ -100,6 +105,9 @@ static int npcm_wdt_stop(struct watchdog_device *wdd)
>
> writel(0, wdt->reg);
>
> + if (wdt->clk)
> + clk_disable_unprepare(wdt->clk);
> +
> return 0;
> }
>
> @@ -147,6 +155,10 @@ static int npcm_wdt_restart(struct watchdog_device *wdd,
> {
> struct npcm_wdt *wdt = to_npcm_wdt(wdd);
>
> + /* For reset, we start the WDT clock and leave it running. */
> + if (wdt->clk)
> + clk_prepare_enable(wdt->clk);
> +
> writel(NPCM_WTR | NPCM_WTRE | NPCM_WTE, wdt->reg);
> udelay(1000);
>
> @@ -191,6 +203,10 @@ static int npcm_wdt_probe(struct platform_device *pdev)
> if (IS_ERR(wdt->reg))
> return PTR_ERR(wdt->reg);
>
> + wdt->clk = devm_clk_get_optional(&pdev->dev, NULL);
> + if (IS_ERR(wdt->clk))
> + return PTR_ERR(wdt->clk);
> +
> irq = platform_get_irq(pdev, 0);
> if (irq < 0)
> return irq;
next prev parent reply other threads:[~2022-09-25 17:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-10 7:21 [PATCH v4 0/6] Nuvoton WPCM450 clock and reset driver Jonathan Neuschäfer
2022-06-10 7:21 ` [PATCH v4 1/6] dt-bindings: timer: nuvoton,npcm7xx-timer: Allow specifying all clocks Jonathan Neuschäfer
2022-06-10 7:21 ` [PATCH v4 2/6] watchdog: npcm: Enable clock if provided Jonathan Neuschäfer
2022-09-25 17:00 ` Guenter Roeck [this message]
2022-06-10 7:21 ` [PATCH v4 3/6] dt-bindings: clock: Add Nuvoton WPCM450 clock/reset controller Jonathan Neuschäfer
2022-06-10 7:21 ` [PATCH v4 4/6] ARM: dts: wpcm450: Add clock controller node Jonathan Neuschäfer
2022-06-10 7:21 ` [PATCH v4 5/6] clk: wpcm450: Add Nuvoton WPCM450 clock/reset controller driver Jonathan Neuschäfer
2022-06-10 7:21 ` [PATCH v4 6/6] ARM: dts: wpcm450: Switch clocks to clock controller Jonathan Neuschäfer
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=20220925170053.GA1761191@roeck-us.net \
--to=linux@roeck-us.net \
--cc=avifishman70@gmail.com \
--cc=benjaminfair@google.com \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=j.neuschaefer@gmx.net \
--cc=krzk+dt@kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=openbmc@lists.ozlabs.org \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=tali.perry1@gmail.com \
--cc=tglx@linutronix.de \
--cc=tmaimon77@gmail.com \
--cc=venture@google.com \
--cc=wim@linux-watchdog.org \
--cc=yuenn@google.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).