| Message ID | 20250312062016.137821-1-xxm@rock-chips.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | iio: adc: rockchip: Fix clock initialization sequence | expand |
Am Mittwoch, 12. März 2025, 07:20:16 MEZ schrieb Simon Xue: > clock_set_rate should be executed after devm_clk_get_enabled. > > Fixes: 97ad10bb2901 ("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> > --- > drivers/iio/adc/rockchip_saradc.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c > index a29e54754c8f..ab4de67fb135 100644 > --- a/drivers/iio/adc/rockchip_saradc.c > +++ b/drivers/iio/adc/rockchip_saradc.c > @@ -480,15 +480,6 @@ static int rockchip_saradc_probe(struct platform_device *pdev) > if (info->reset) > rockchip_saradc_reset_controller(info->reset); > > - /* > - * Use a default value for the converter clock. > - * This may become user-configurable in the future. > - */ > - ret = clk_set_rate(info->clk, info->data->clk_rate); > - if (ret < 0) > - return dev_err_probe(&pdev->dev, ret, > - "failed to set adc clk rate\n"); > - > ret = regulator_enable(info->vref); > if (ret < 0) > return dev_err_probe(&pdev->dev, ret, > @@ -515,6 +506,14 @@ static int rockchip_saradc_probe(struct platform_device *pdev) > if (IS_ERR(info->clk)) > return dev_err_probe(&pdev->dev, PTR_ERR(info->clk), > "failed to get adc clock\n"); > + /* > + * Use a default value for the converter clock. > + * This may become user-configurable in the future. > + */ > + ret = clk_set_rate(info->clk, info->data->clk_rate); > + if (ret < 0) > + return dev_err_probe(&pdev->dev, ret, > + "failed to set adc clk rate\n"); > > platform_set_drvdata(pdev, indio_dev); > >
diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c index a29e54754c8f..ab4de67fb135 100644 --- a/drivers/iio/adc/rockchip_saradc.c +++ b/drivers/iio/adc/rockchip_saradc.c @@ -480,15 +480,6 @@ static int rockchip_saradc_probe(struct platform_device *pdev) if (info->reset) rockchip_saradc_reset_controller(info->reset); - /* - * Use a default value for the converter clock. - * This may become user-configurable in the future. - */ - ret = clk_set_rate(info->clk, info->data->clk_rate); - if (ret < 0) - return dev_err_probe(&pdev->dev, ret, - "failed to set adc clk rate\n"); - ret = regulator_enable(info->vref); if (ret < 0) return dev_err_probe(&pdev->dev, ret, @@ -515,6 +506,14 @@ static int rockchip_saradc_probe(struct platform_device *pdev) if (IS_ERR(info->clk)) return dev_err_probe(&pdev->dev, PTR_ERR(info->clk), "failed to get adc clock\n"); + /* + * Use a default value for the converter clock. + * This may become user-configurable in the future. + */ + ret = clk_set_rate(info->clk, info->data->clk_rate); + if (ret < 0) + return dev_err_probe(&pdev->dev, ret, + "failed to set adc clk rate\n"); platform_set_drvdata(pdev, indio_dev);
clock_set_rate should be executed after devm_clk_get_enabled. Fixes: 97ad10bb2901 ("iio: adc: rockchip_saradc: Make use of devm_clk_get_enabled") Signed-off-by: Simon Xue <xxm@rock-chips.com> --- drivers/iio/adc/rockchip_saradc.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)