[PATCH] i2c: rk3x: enable clock before getting rate

[PATCH] i2c: rk3x: enable clock before getting rate

[John Keeping]

clk_get_rate() is documented as requiring the clock to be enabled.
Ensure that the bus clock is enabled before calling clk_get_rate() in
rk3x_i2c_probe() to satisfy this requirement.

Signed-off-by: John Keeping <john@metanate.com>
---
 drivers/i2c/busses/i2c-rk3x.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
index 819ab4ee517e..332755fab2a1 100644
--- a/drivers/i2c/busses/i2c-rk3x.c
+++ b/drivers/i2c/busses/i2c-rk3x.c
@@ -1338,8 +1338,15 @@ static int rk3x_i2c_probe(struct platform_device *pdev)
 		goto err_pclk;
 	}
 
+	ret = clk_enable(i2c->clk);
+	if (ret < 0) {
+		dev_err(&pdev->dev, "Can't enable bus clk: %d\n", ret);
+		goto err_clk_notifier;
+	}
+
 	clk_rate = clk_get_rate(i2c->clk);
 	rk3x_i2c_adapt_div(i2c, clk_rate);
+	clk_disable(i2c->clk);
 
 	ret = i2c_add_adapter(&i2c->adap);
 	if (ret < 0)
-- 
2.33.0

Re: [PATCH] i2c: rk3x: enable clock before getting rate

[Heiko Stübner]

Am Montag, 4. Oktober 2021, 15:15:39 CET schrieb John Keeping:
> clk_get_rate() is documented as requiring the clock to be enabled.
> Ensure that the bus clock is enabled before calling clk_get_rate() in
> rk3x_i2c_probe() to satisfy this requirement.
> 
> Signed-off-by: John Keeping <john@metanate.com>

Reviewed-by: Heiko Stuebner <heiko@sntech.de>

Do you maybe want to repost and include the actual i2c-maintainers
in the recipient list?


Heiko

> ---
>  drivers/i2c/busses/i2c-rk3x.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
> index 819ab4ee517e..332755fab2a1 100644
> --- a/drivers/i2c/busses/i2c-rk3x.c
> +++ b/drivers/i2c/busses/i2c-rk3x.c
> @@ -1338,8 +1338,15 @@ static int rk3x_i2c_probe(struct platform_device *pdev)
>  		goto err_pclk;
>  	}
>  
> +	ret = clk_enable(i2c->clk);
> +	if (ret < 0) {
> +		dev_err(&pdev->dev, "Can't enable bus clk: %d\n", ret);
> +		goto err_clk_notifier;
> +	}
> +
>  	clk_rate = clk_get_rate(i2c->clk);
>  	rk3x_i2c_adapt_div(i2c, clk_rate);
> +	clk_disable(i2c->clk);
>  
>  	ret = i2c_add_adapter(&i2c->adap);
>  	if (ret < 0)
> 

Re: [PATCH] i2c: rk3x: enable clock before getting rate

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 637 bytes --]

On Sun, Nov 21, 2021 at 07:00:55PM +0100, Heiko Stübner wrote:
> Am Montag, 4. Oktober 2021, 15:15:39 CET schrieb John Keeping:
> > clk_get_rate() is documented as requiring the clock to be enabled.
> > Ensure that the bus clock is enabled before calling clk_get_rate() in
> > rk3x_i2c_probe() to satisfy this requirement.
> > 
> > Signed-off-by: John Keeping <john@metanate.com>
> 
> Reviewed-by: Heiko Stuebner <heiko@sntech.de>
> 
> Do you maybe want to repost and include the actual i2c-maintainers
> in the recipient list?

No need. This is in patchwork and now has a Rev-by. Good enough.

Thanks for the review!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] i2c: rk3x: enable clock before getting rate

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 436 bytes --]

On Mon, Oct 04, 2021 at 02:15:39PM +0100, John Keeping wrote:
> clk_get_rate() is documented as requiring the clock to be enabled.
> Ensure that the bus clock is enabled before calling clk_get_rate() in
> rk3x_i2c_probe() to satisfy this requirement.
> 
> Signed-off-by: John Keeping <john@metanate.com>

Doesn't look like an urgent bugfix, so applied to for-next, thanks! Let
me know if it should go to for-current instead.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]