[RESEND v4 08/15] iio: adc: aspeed: Use model_data to set clk scaler.

Jonathan Cameron
2021-08-29T15:20:22Z

On Tue, 24 Aug 2021 17:12:36 +0800
Billy Tsai <billy_tsai@aspeedtech.com> wrote:

> This patch use need_prescaler and scaler_bit_width to set the adc clock
> scaler.
>
> Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com>
Hi Billy,

One minor comment inline.

Thanks,

Jonathan

> ---
> drivers/iio/adc/aspeed_adc.c | 39 +++++++++++++++++++++---------------
> 1 file changed, 23 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c
> index 2d6215a91f99..52db38be9699 100644
> --- a/drivers/iio/adc/aspeed_adc.c
> +++ b/drivers/iio/adc/aspeed_adc.c
> @@ -202,9 +202,10 @@ static int aspeed_adc_probe(struct platform_device *pdev)
> {
> struct iio_dev *indio_dev;
> struct aspeed_adc_data *data;
> - const char *clk_parent_name;
> int ret;
> u32 adc_engine_control_reg_val;
> + unsigned long scaler_flags = 0;
> + char clk_name[32], clk_parent_name[32];
>
> indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*data));
> if (!indio_dev)
> @@ -221,24 +222,28 @@ static int aspeed_adc_probe(struct platform_device *pdev)
>
> /* Register ADC clock prescaler with source specified by device tree. */
> spin_lock_init(&data->clk_lock);
> - clk_parent_name = of_clk_get_parent_name(pdev->dev.of_node, 0);
> -
> - data->clk_prescaler = clk_hw_register_divider(
> - &pdev->dev, "prescaler", clk_parent_name, 0,
> - data->base + ASPEED_REG_CLOCK_CONTROL,
> - 17, 15, 0, &data->clk_lock);
> - if (IS_ERR(data->clk_prescaler))
> - return PTR_ERR(data->clk_prescaler);
> -
> + snprintf(clk_parent_name, 32, of_clk_get_parent_name(pdev->dev.of_node, 0));

ARRAY_SIZE(clk_parent_name) instead of 32.
Same for other places this pattern occurs.

> + if (data->model_data->need_prescaler) {
> + snprintf(clk_name, 32, "%s-prescaler",
> + data->model_data->model_name);
> + data->clk_prescaler = clk_hw_register_divider(
> + &pdev->dev, clk_name, clk_parent_name, 0,
> + data->base + ASPEED_REG_CLOCK_CONTROL, 17, 15, 0,
> + &data->clk_lock);
> + if (IS_ERR(data->clk_prescaler))
> + return PTR_ERR(data->clk_prescaler);
> + snprintf(clk_parent_name, 32, clk_name);
> + scaler_flags = CLK_SET_RATE_PARENT;
> + }
> /*
> * Register ADC clock scaler downstream from the prescaler. Allow rate
> * setting to adjust the prescaler as well.
> */
> + snprintf(clk_name, 32, "%s-scaler", data->model_data->model_name);
> data->clk_scaler = clk_hw_register_divider(
> - &pdev->dev, "scaler", "prescaler",
> - CLK_SET_RATE_PARENT,
> - data->base + ASPEED_REG_CLOCK_CONTROL,
> - 0, 10, 0, &data->clk_lock);
> + &pdev->dev, clk_name, clk_parent_name, scaler_flags,
> + data->base + ASPEED_REG_CLOCK_CONTROL, 0,
> + data->model_data->scaler_bit_width, 0, &data->clk_lock);
> if (IS_ERR(data->clk_scaler)) {
> ret = PTR_ERR(data->clk_scaler);
> goto scaler_error;
> @@ -310,7 +315,8 @@ static int aspeed_adc_probe(struct platform_device *pdev)
> reset_error:
> clk_hw_unregister_divider(data->clk_scaler);
> scaler_error:
> - clk_hw_unregister_divider(data->clk_prescaler);
> + if (data->model_data->need_prescaler)
> + clk_hw_unregister_divider(data->clk_prescaler);
> return ret;
> }
>
> @@ -325,7 +331,8 @@ static int aspeed_adc_remove(struct platform_device *pdev)
> clk_disable_unprepare(data->clk_scaler->clk);
> reset_control_assert(data->rst);
> clk_hw_unregister_divider(data->clk_scaler);
> - clk_hw_unregister_divider(data->clk_prescaler);
> + if (data->model_data->need_prescaler)
> + clk_hw_unregister_divider(data->clk_prescaler);
>
> return 0;
> }