[PATCH v2 1/2] thermal/drivers/qoriq: Use dev_err_probe() simplify the code

[PATCH v2 1/2] thermal/drivers/qoriq: Use dev_err_probe() simplify the code

[Frank Li]

Use dev_err_probe() and devm_clk_get_optional_enabled() to simplify the
code.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
change from v1 to v2
- Remove clk_disable_unprepare() in qoriq_tmu_action()
---
 drivers/thermal/qoriq_thermal.c | 34 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index 52e26be8c53df..183af15c33769 100644
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -265,7 +265,6 @@ static void qoriq_tmu_action(void *p)
 	struct qoriq_tmu_data *data = p;
 
 	regmap_write(data->regmap, REGS_TMR, TMR_DISABLE);
-	clk_disable_unprepare(data->clk);
 }
 
 static int qoriq_tmu_probe(struct platform_device *pdev)
@@ -296,38 +295,27 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
 
 	base = devm_platform_ioremap_resource(pdev, 0);
 	ret = PTR_ERR_OR_ZERO(base);
-	if (ret) {
-		dev_err(dev, "Failed to get memory region\n");
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(dev, ret, "Failed to get memory region\n");
 
 	data->regmap = devm_regmap_init_mmio(dev, base, &regmap_config);
 	ret = PTR_ERR_OR_ZERO(data->regmap);
-	if (ret) {
-		dev_err(dev, "Failed to init regmap (%d)\n", ret);
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(dev, ret, "Failed to init regmap\n");
 
-	data->clk = devm_clk_get_optional(dev, NULL);
+	data->clk = devm_clk_get_optional_enabled(dev, NULL);
 	if (IS_ERR(data->clk))
 		return PTR_ERR(data->clk);
 
-	ret = clk_prepare_enable(data->clk);
-	if (ret) {
-		dev_err(dev, "Failed to enable clock\n");
-		return ret;
-	}
-
 	ret = devm_add_action_or_reset(dev, qoriq_tmu_action, data);
 	if (ret)
 		return ret;
 
 	/* version register offset at: 0xbf8 on both v1 and v2 */
 	ret = regmap_read(data->regmap, REGS_IPBRR(0), &ver);
-	if (ret) {
-		dev_err(&pdev->dev, "Failed to read IP block version\n");
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(dev, ret,  "Failed to read IP block version\n");
+
 	data->ver = (ver >> 8) & 0xff;
 
 	qoriq_tmu_init_device(data);	/* TMU initialization */
@@ -337,10 +325,8 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
 		return ret;
 
 	ret = qoriq_tmu_register_tmu_zone(dev, data);
-	if (ret < 0) {
-		dev_err(dev, "Failed to register sensors\n");
-		return ret;
-	}
+	if (ret < 0)
+		return dev_err_probe(dev, ret, "Failed to register sensors\n");
 
 	platform_set_drvdata(pdev, data);
 
-- 
2.34.1

[PATCH v2 2/2] thermal/drivers/qoriq: Power down TMU on system suspend

[Frank Li]

From: Alice Guo <alice.guo@nxp.com>

Enable power-down of TMU (Thermal Management Unit) for TMU version 2 during
system suspend to save power. Save approximately 4.3mW on VDD_ANA_1P8 on
i.MX93 platforms.

Signed-off-by: Alice Guo <alice.guo@nxp.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
change from v1 to v2
- none
---
 drivers/thermal/qoriq_thermal.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index 183af15c33769..01b58be0dcc64 100644
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -18,6 +18,7 @@
 #define SITES_MAX		16
 #define TMR_DISABLE		0x0
 #define TMR_ME			0x80000000
+#define TMR_CMD			BIT(29)
 #define TMR_ALPF		0x0c000000
 #define TMR_ALPF_V2		0x03000000
 #define TMTMIR_DEFAULT	0x0000000f
@@ -342,6 +343,12 @@ static int qoriq_tmu_suspend(struct device *dev)
 	if (ret)
 		return ret;
 
+	if (data->ver > TMU_VER1) {
+		ret = regmap_set_bits(data->regmap, REGS_TMR, TMR_CMD);
+		if (ret)
+			return ret;
+	}
+
 	clk_disable_unprepare(data->clk);
 
 	return 0;
@@ -356,6 +363,12 @@ static int qoriq_tmu_resume(struct device *dev)
 	if (ret)
 		return ret;
 
+	if (data->ver > TMU_VER1) {
+		ret = regmap_clear_bits(data->regmap, REGS_TMR, TMR_CMD);
+		if (ret)
+			return ret;
+	}
+
 	/* Enable monitoring */
 	return regmap_update_bits(data->regmap, REGS_TMR, TMR_ME, TMR_ME);
 }
-- 
2.34.1

Re: [PATCH v2 1/2] thermal/drivers/qoriq: Use dev_err_probe() simplify the code

[Frank Li]

On Mon, Dec 09, 2024 at 11:48:58AM -0500, Frank Li wrote:
> Use dev_err_probe() and devm_clk_get_optional_enabled() to simplify the
> code.
>
> Signed-off-by: Frank Li <Frank.Li@nxp.com>

Rafael J. Wysocki:

	Do you have chance to check this patches?

Frank

> ---
> change from v1 to v2
> - Remove clk_disable_unprepare() in qoriq_tmu_action()
> ---
>  drivers/thermal/qoriq_thermal.c | 34 ++++++++++-----------------------
>  1 file changed, 10 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
> index 52e26be8c53df..183af15c33769 100644
> --- a/drivers/thermal/qoriq_thermal.c
> +++ b/drivers/thermal/qoriq_thermal.c
> @@ -265,7 +265,6 @@ static void qoriq_tmu_action(void *p)
>  	struct qoriq_tmu_data *data = p;
>
>  	regmap_write(data->regmap, REGS_TMR, TMR_DISABLE);
> -	clk_disable_unprepare(data->clk);
>  }
>
>  static int qoriq_tmu_probe(struct platform_device *pdev)
> @@ -296,38 +295,27 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
>
>  	base = devm_platform_ioremap_resource(pdev, 0);
>  	ret = PTR_ERR_OR_ZERO(base);
> -	if (ret) {
> -		dev_err(dev, "Failed to get memory region\n");
> -		return ret;
> -	}
> +	if (ret)
> +		return dev_err_probe(dev, ret, "Failed to get memory region\n");
>
>  	data->regmap = devm_regmap_init_mmio(dev, base, &regmap_config);
>  	ret = PTR_ERR_OR_ZERO(data->regmap);
> -	if (ret) {
> -		dev_err(dev, "Failed to init regmap (%d)\n", ret);
> -		return ret;
> -	}
> +	if (ret)
> +		return dev_err_probe(dev, ret, "Failed to init regmap\n");
>
> -	data->clk = devm_clk_get_optional(dev, NULL);
> +	data->clk = devm_clk_get_optional_enabled(dev, NULL);
>  	if (IS_ERR(data->clk))
>  		return PTR_ERR(data->clk);
>
> -	ret = clk_prepare_enable(data->clk);
> -	if (ret) {
> -		dev_err(dev, "Failed to enable clock\n");
> -		return ret;
> -	}
> -
>  	ret = devm_add_action_or_reset(dev, qoriq_tmu_action, data);
>  	if (ret)
>  		return ret;
>
>  	/* version register offset at: 0xbf8 on both v1 and v2 */
>  	ret = regmap_read(data->regmap, REGS_IPBRR(0), &ver);
> -	if (ret) {
> -		dev_err(&pdev->dev, "Failed to read IP block version\n");
> -		return ret;
> -	}
> +	if (ret)
> +		return dev_err_probe(dev, ret,  "Failed to read IP block version\n");
> +
>  	data->ver = (ver >> 8) & 0xff;
>
>  	qoriq_tmu_init_device(data);	/* TMU initialization */
> @@ -337,10 +325,8 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
>  		return ret;
>
>  	ret = qoriq_tmu_register_tmu_zone(dev, data);
> -	if (ret < 0) {
> -		dev_err(dev, "Failed to register sensors\n");
> -		return ret;
> -	}
> +	if (ret < 0)
> +		return dev_err_probe(dev, ret, "Failed to register sensors\n");
>
>  	platform_set_drvdata(pdev, data);
>
> --
> 2.34.1
>

Re: [PATCH v2 1/2] thermal/drivers/qoriq: Use dev_err_probe() simplify the code

[Daniel Lezcano]

Hi Frank,

On 22/01/2025 16:52, Frank Li wrote:
> On Mon, Dec 09, 2024 at 11:48:58AM -0500, Frank Li wrote:
>> Use dev_err_probe() and devm_clk_get_optional_enabled() to simplify the
>> code.
>>
>> Signed-off-by: Frank Li <Frank.Li@nxp.com>

I applied the patches, thanks


-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH v2 1/2] thermal/drivers/qoriq: Use dev_err_probe() simplify the code

[Frank Li]

On Wed, Jan 22, 2025 at 06:41:22PM +0100, Daniel Lezcano wrote:
> Hi Frank,
>
> On 22/01/2025 16:52, Frank Li wrote:
> > On Mon, Dec 09, 2024 at 11:48:58AM -0500, Frank Li wrote:
> > > Use dev_err_probe() and devm_clk_get_optional_enabled() to simplify the
> > > code.
> > >
> > > Signed-off-by: Frank Li <Frank.Li@nxp.com>
>
> I applied the patches, thanks
>

Thanks, I have not seen at linux-next/master. Anything missed?

Frank

>
> --
> <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
>
> Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
> <http://twitter.com/#!/linaroorg> Twitter |
> <http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH v2 1/2] thermal/drivers/qoriq: Use dev_err_probe() simplify the code

[Daniel Lezcano]

On 18/02/2025 18:32, Frank Li wrote:
> On Wed, Jan 22, 2025 at 06:41:22PM +0100, Daniel Lezcano wrote:
>> Hi Frank,
>>
>> On 22/01/2025 16:52, Frank Li wrote:
>>> On Mon, Dec 09, 2024 at 11:48:58AM -0500, Frank Li wrote:
>>>> Use dev_err_probe() and devm_clk_get_optional_enabled() to simplify the
>>>> code.
>>>>
>>>> Signed-off-by: Frank Li <Frank.Li@nxp.com>
>>
>> I applied the patches, thanks
>>
> 
> Thanks, I have not seen at linux-next/master. Anything missed?

No, it is in the thermal/bleeding-edge ATM and will go through 
thermal/linux-next tomorrow.

-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog