Skip to content

Commit 839f81d

Browse files
Simon Xuejic23
authored andcommitted
iio: adc: rockchip: Fix clock initialization sequence
clock_set_rate should be executed after devm_clk_get_enabled. Fixes: 97ad10b ("iio: adc: rockchip_saradc: Make use of devm_clk_get_enabled") Signed-off-by: Simon Xue <xxm@rock-chips.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Link: https://patch.msgid.link/20250312062016.137821-1-xxm@rock-chips.com Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
1 parent 8114ef8 commit 839f81d

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

drivers/iio/adc/rockchip_saradc.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -520,15 +520,6 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
520520
if (info->reset)
521521
rockchip_saradc_reset_controller(info->reset);
522522

523-
/*
524-
* Use a default value for the converter clock.
525-
* This may become user-configurable in the future.
526-
*/
527-
ret = clk_set_rate(info->clk, info->data->clk_rate);
528-
if (ret < 0)
529-
return dev_err_probe(&pdev->dev, ret,
530-
"failed to set adc clk rate\n");
531-
532523
ret = regulator_enable(info->vref);
533524
if (ret < 0)
534525
return dev_err_probe(&pdev->dev, ret,
@@ -555,6 +546,14 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
555546
if (IS_ERR(info->clk))
556547
return dev_err_probe(&pdev->dev, PTR_ERR(info->clk),
557548
"failed to get adc clock\n");
549+
/*
550+
* Use a default value for the converter clock.
551+
* This may become user-configurable in the future.
552+
*/
553+
ret = clk_set_rate(info->clk, info->data->clk_rate);
554+
if (ret < 0)
555+
return dev_err_probe(&pdev->dev, ret,
556+
"failed to set adc clk rate\n");
558557

559558
platform_set_drvdata(pdev, indio_dev);
560559

0 commit comments

Comments
 (0)