From: Billy Tsai <billy_tsai@aspeedtech.com>
To: linux-aspeed@lists.ozlabs.org
Subject: [v6 07/11] iio: adc: aspeed: Fix the calculate error of clock.
Date: Fri, 17 Sep 2021 01:12:13 +0000 [thread overview]
Message-ID: <1A7A8472-1AAA-4F51-A9CF-08BF1837F9EB@aspeedtech.com> (raw)
In-Reply-To: <20210913075337.19991-8-billy_tsai@aspeedtech.com>
On 2021/9/13, 3:51 PM, "Billy Tsai" <billy_tsai@aspeedtech.com> wrote:
> The ADC clock formula is
> ast2400/2500:
> ADC clock period = PCLK * 2 * (ADC0C[31:17] + 1) * (ADC0C[9:0] + 1)
> ast2600:
> ADC clock period = PCLK * 2 * (ADC0C[15:0] + 1)
> They all have one fixed divided 2 and the legacy driver didn't handle it.
> This patch register the fixed factory clock device as the parent of ADC
> clock scaler to fix this issue.
> Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com>
> ---
> drivers/iio/adc/aspeed_adc.c | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
> diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c
> index 3ec4e1a2ddd3..262b5f80c728 100644
> --- a/drivers/iio/adc/aspeed_adc.c
> +++ b/drivers/iio/adc/aspeed_adc.c
> @@ -4,6 +4,12 @@
> *
> * Copyright (C) 2017 Google, Inc.
> * Copyright (C) 2021 Aspeed Technology Inc.
> + *
> + * ADC clock formula:
> + * Ast2400/Ast2500:
> + * clock period = period of PCLK * 2 * (ADC0C[31:17] + 1) * (ADC0C[9:0] + 1)
> + * Ast2600:
> + * clock period = period of PCLK * 2 * (ADC0C[15:0] + 1)
> */
> #include <linux/clk.h>
> @@ -85,6 +91,7 @@ struct aspeed_adc_data {
> struct regulator *regulator;
> void __iomem *base;
> spinlock_t clk_lock;
> + struct clk_hw *fixed_div_clk;
> struct clk_hw *clk_prescaler;
> struct clk_hw *clk_scaler;
> struct reset_control *rst;
> @@ -197,6 +204,13 @@ static const struct iio_info aspeed_adc_iio_info = {
> .debugfs_reg_access = aspeed_adc_reg_access,
> };
> +static void aspeed_adc_unregister_fixed_divider(void *data)
> +{
> + struct clk_hw *clk = data;
> +
> + clk_hw_unregister_fixed_factor(clk);
> +}
> +
> static void aspeed_adc_reset_assert(void *data)
> {
> struct reset_control *rst = data;
> @@ -321,6 +335,19 @@ static int aspeed_adc_probe(struct platform_device *pdev)
> spin_lock_init(&data->clk_lock);
> snprintf(clk_parent_name, ARRAY_SIZE(clk_parent_name), "%s",
> of_clk_get_parent_name(pdev->dev.of_node, 0));
> + snprintf(clk_name, ARRAY_SIZE(clk_name), "%s-fixed-div",
> + data->model_data->model_name);
> + data->fixed_div_clk = clk_hw_register_fixed_factor(
> + &pdev->dev, clk_name, clk_parent_name, 0, 1, 2);
> + if (IS_ERR(data->fixed_div_clk))
> + return PTR_ERR(data->fixed_div_clk);
> +
> + ret = devm_add_action_or_reset(data->dev,
> + aspeed_adc_unregister_fixed_divider,
> + data->clk_prescaler);
I found that the parameter aspeed_adc_unregister_fixed_divider is wrong.
I will send patch v7 after the other patches are reviewed.
Thanks
> + if (ret)
> + return ret;
> + snprintf(clk_parent_name, ARRAY_SIZE(clk_parent_name), clk_name);
> if (data->model_data->need_prescaler) {
> snprintf(clk_name, ARRAY_SIZE(clk_name), "%s-prescaler",
> --
> 2.25.1
next prev parent reply other threads:[~2021-09-17 1:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-13 7:53 [v6 00/11] Add support for ast2600 ADC Billy Tsai
2021-09-13 7:53 ` [v6 01/11] iio: adc: aspeed: Keep model data to driver data Billy Tsai
2021-09-13 7:53 ` [v6 02/11] iio: adc: aspeed: Restructure the model data Billy Tsai
2021-09-13 7:53 ` [v6 03/11] iio: adc: aspeed: Add vref config function Billy Tsai
2021-09-13 7:53 ` [v6 04/11] iio: adc: aspeed: Use model_data to set clk scaler Billy Tsai
2021-09-13 7:53 ` [v6 05/11] iio: adc: aspeed: Use devm_add_action_or_reset Billy Tsai
2021-09-13 7:53 ` [v6 06/11] iio: adc: aspeed: Support ast2600 adc Billy Tsai
2021-09-13 7:53 ` [v6 07/11] iio: adc: aspeed: Fix the calculate error of clock Billy Tsai
2021-09-17 1:12 ` Billy Tsai [this message]
2021-09-18 17:57 ` Jonathan Cameron
2021-09-13 7:53 ` [v6 08/11] iio: adc: aspeed: Add func to set sampling rate Billy Tsai
2021-09-13 7:53 ` [v6 09/11] iio: adc: aspeed: Add compensation phase Billy Tsai
2021-09-13 7:53 ` [v6 10/11] iio: adc: aspeed: Support battery sensing Billy Tsai
2021-09-13 7:53 ` [v6 11/11] iio: adc: aspeed: Get and set trimming data Billy Tsai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1A7A8472-1AAA-4F51-A9CF-08BF1837F9EB@aspeedtech.com \
--to=billy_tsai@aspeedtech.com \
--cc=linux-aspeed@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox