| Message ID | 20220422183012.444674-4-j.neuschaefer@gmx.net |
|---|---|
| State | New |
| Headers | show |
| Series | Nuvoton WPCM450 clock and reset driver | expand |
On Fri, Apr 22, 2022 at 11:34:17AM -0700, Guenter Roeck wrote: > On Fri, Apr 22, 2022 at 08:30:08PM +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> > > --- > > drivers/watchdog/npcm_wdt.c | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/drivers/watchdog/npcm_wdt.c b/drivers/watchdog/npcm_wdt.c > > index 28a24caa2627c..6d27f0e16188e 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> > > @@ -180,6 +181,7 @@ static int npcm_wdt_probe(struct platform_device *pdev) > > { > > struct device *dev = &pdev->dev; > > struct npcm_wdt *wdt; > > + struct clk *clk; > > int irq; > > int ret; > > > > @@ -191,6 +193,13 @@ static int npcm_wdt_probe(struct platform_device *pdev) > > if (IS_ERR(wdt->reg)) > > return PTR_ERR(wdt->reg); > > > > + clk = devm_clk_get_optional(&pdev->dev, NULL); > > + if (IS_ERR(clk)) > > + return PTR_ERR(clk); > > + > > + if (clk) > > + clk_prepare_enable(clk); > > + > > This needs a matching clk_disable_unprepare(). Good point. It's probably easiest if I move the clk calls to the watchdog start/stop callbacks, then. Thanks, Jonathan
diff --git a/drivers/watchdog/npcm_wdt.c b/drivers/watchdog/npcm_wdt.c index 28a24caa2627c..6d27f0e16188e 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> @@ -180,6 +181,7 @@ static int npcm_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct npcm_wdt *wdt; + struct clk *clk; int irq; int ret; @@ -191,6 +193,13 @@ static int npcm_wdt_probe(struct platform_device *pdev) if (IS_ERR(wdt->reg)) return PTR_ERR(wdt->reg); + clk = devm_clk_get_optional(&pdev->dev, NULL); + if (IS_ERR(clk)) + return PTR_ERR(clk); + + if (clk) + clk_prepare_enable(clk); + irq = platform_get_irq(pdev, 0); if (irq < 0) return irq;
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> --- drivers/watchdog/npcm_wdt.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.35.1