From: "Guido Günther" <agx@sigxcpu.org>
To: Anson.Huang@nxp.com
Cc: rui.zhang@intel.com, edubezval@gmail.com,
daniel.lezcano@linaro.org, robh+dt@kernel.org,
mark.rutland@arm.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de,
festevam@gmail.com, mturquette@baylibre.com, sboyd@kernel.org,
l.stach@pengutronix.de, abel.vesa@nxp.com,
andrew.smirnov@gmail.com, angus@akkea.ca, ccaione@baylibre.com,
leonard.crestez@nxp.com, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
Linux-imx@nxp.com
Subject: Re: [PATCH 4/6] thermal: qoriq: Add clock operations
Date: Mon, 29 Jul 2019 10:12:21 +0200 [thread overview]
Message-ID: <20190729081221.GA2523@bogon.m.sigxcpu.org> (raw)
In-Reply-To: <20190705045612.27665-4-Anson.Huang@nxp.com>
Hi Anson,
On Fri, Jul 05, 2019 at 12:56:10PM +0800, Anson.Huang@nxp.com wrote:
> From: Anson Huang <Anson.Huang@nxp.com>
>
> Some platforms like i.MX8MQ has clock control for this module,
> need to add clock operations to make sure the driver is working
> properly.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> drivers/thermal/qoriq_thermal.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
> index 2b2f79b..0813c1b 100644
> --- a/drivers/thermal/qoriq_thermal.c
> +++ b/drivers/thermal/qoriq_thermal.c
> @@ -2,6 +2,7 @@
> //
> // Copyright 2016 Freescale Semiconductor, Inc.
>
> +#include <linux/clk.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <linux/err.h>
> @@ -72,6 +73,7 @@ struct qoriq_sensor {
>
> struct qoriq_tmu_data {
> struct qoriq_tmu_regs __iomem *regs;
> + struct clk *clk;
> bool little_endian;
> struct qoriq_sensor *sensor[SITES_MAX];
> };
> @@ -208,6 +210,19 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
> return PTR_ERR(data->regs);
> }
>
> + data->clk = devm_clk_get(&pdev->dev, NULL);
> + if (IS_ERR(data->clk)) {
> + if (PTR_ERR(data->clk) == -EPROBE_DEFER)
> + return -EPROBE_DEFER;
> + data->clk = NULL;
> + }
Wouldn't devm_clk_get_optional make more sense?
> +
> + ret = clk_prepare_enable(data->clk);
> + if (ret) {
> + dev_err(&pdev->dev, "Failed to enable clock\n");
> + return ret;
> + }
> +
> qoriq_tmu_init_device(data); /* TMU initialization */
>
> ret = qoriq_tmu_calibration(pdev); /* TMU calibration */
> @@ -235,6 +250,8 @@ static int qoriq_tmu_remove(struct platform_device *pdev)
> /* Disable monitoring */
> tmu_write(data, TMR_DISABLE, &data->regs->tmr);
>
> + clk_disable_unprepare(data->clk);
> +
> platform_set_drvdata(pdev, NULL);
>
> return 0;
> @@ -250,14 +267,21 @@ static int __maybe_unused qoriq_tmu_suspend(struct device *dev)
> tmr &= ~TMR_ME;
> tmu_write(data, tmr, &data->regs->tmr);
>
> + clk_disable_unprepare(data->clk);
> +
> return 0;
> }
>
> static int __maybe_unused qoriq_tmu_resume(struct device *dev)
> {
> u32 tmr;
> + int ret;
> struct qoriq_tmu_data *data = dev_get_drvdata(dev);
>
> + ret = clk_prepare_enable(data->clk);
> + if (ret)
> + return ret;
> +
> /* Enable monitoring */
> tmr = tmu_read(data, &data->regs->tmr);
> tmr |= TMR_ME;
Apart from that it looks like what Fabio sent and what i tested so
Reviewed-by: Guido Günther <agx@sigxcpu.org>
Cheers,
-- Guido
> --
> 2.7.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
next prev parent reply other threads:[~2019-07-29 8:12 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-05 4:56 [PATCH 1/6] thermal: qoriq: Use devm_platform_ioremap_resource() instead of of_iomap() Anson.Huang
2019-07-05 4:56 ` [PATCH 2/6] thermal: qoriq: Use __maybe_unused instead of #if CONFIG_PM_SLEEP Anson.Huang
2019-07-05 4:56 ` [PATCH 3/6] dt-bindings: thermal: qoriq: Add optional clocks property Anson.Huang
2019-07-22 23:55 ` Rob Herring
2019-07-05 4:56 ` [PATCH 4/6] thermal: qoriq: Add clock operations Anson.Huang
2019-07-29 8:12 ` Guido Günther [this message]
2019-07-29 8:40 ` Anson Huang
2019-07-05 4:56 ` [PATCH 5/6] clk: imx8mq: Remove CLK_IS_CRITICAL flag for IMX8MQ_CLK_TMU_ROOT Anson.Huang
2019-07-05 7:01 ` Abel Vesa
2019-07-22 21:31 ` Stephen Boyd
2019-07-23 2:50 ` Shawn Guo
2019-07-26 22:26 ` Daniel Baluta
2019-07-27 6:19 ` Anson Huang
2019-07-27 6:33 ` Daniel Baluta
2019-07-27 16:17 ` Abel Vesa
2019-07-29 1:29 ` Anson Huang
2019-07-29 6:51 ` Daniel Baluta
2019-07-29 7:14 ` Anson Huang
2019-07-29 7:20 ` Daniel Baluta
2019-07-29 7:21 ` Daniel Baluta
2019-07-29 7:49 ` Anson Huang
2019-07-29 8:13 ` Daniel Baluta
2019-07-27 18:26 ` Guido Günther
2019-07-27 20:17 ` Fabio Estevam
2019-07-28 7:58 ` Guido Günther
2019-07-28 15:24 ` Fabio Estevam
2019-07-05 4:56 ` [PATCH 6/6] arm64: dts: imx8mq: Add clock for TMU node Anson.Huang
2019-07-23 2:51 ` Shawn Guo
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=20190729081221.GA2523@bogon.m.sigxcpu.org \
--to=agx@sigxcpu.org \
--cc=Anson.Huang@nxp.com \
--cc=Linux-imx@nxp.com \
--cc=abel.vesa@nxp.com \
--cc=andrew.smirnov@gmail.com \
--cc=angus@akkea.ca \
--cc=ccaione@baylibre.com \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=edubezval@gmail.com \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=leonard.crestez@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
--cc=s.hauer@pengutronix.de \
--cc=sboyd@kernel.org \
--cc=shawnguo@kernel.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).