From: Jonathan Cameron <jic23@kernel.org>
To: Billy Tsai <billy_tsai@aspeedtech.com>
Cc: <lars@metafoo.de>, <pmeerw@pmeerw.net>, <robh+dt@kernel.org>,
<joel@jms.id.au>, <andrew@aj.id.au>, <p.zabel@pengutronix.de>,
<lgirdwood@gmail.com>, <broonie@kernel.org>,
<linux-iio@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-aspeed@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>,
<BMC-SW@aspeedtech.com>
Subject: Re: [RESEND v4 08/15] iio: adc: aspeed: Use model_data to set clk scaler.
Date: Sun, 29 Aug 2021 16:20:22 +0100 [thread overview]
Message-ID: <20210829162022.7ee18854@jic23-huawei> (raw)
In-Reply-To: <202108250006.17P06IgG097015@twspam01.aspeedtech.com>
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;
> }
next prev parent reply other threads:[~2021-08-29 15:17 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-24 9:12 [RESEND v4 00/15] Add support for ast2600 ADC Billy Tsai
2021-08-24 9:12 ` [RESEND v4 01/15] dt-bindings: iio: adc: Add ast2600-adc bindings Billy Tsai
2021-08-24 9:12 ` [RESEND v4 02/15] iio: adc: aspeed: completes the bitfield declare Billy Tsai
2021-08-29 15:07 ` Jonathan Cameron
2021-08-24 9:12 ` [RESEND v4 03/15] iio: adc: aspeed: set driver data when adc probe Billy Tsai
2021-08-29 15:08 ` Jonathan Cameron
2021-08-24 9:12 ` [RESEND v4 04/15] iio: adc: aspeed: Keep model data to driver data Billy Tsai
2021-08-24 9:12 ` [RESEND v4 05/15] iio: adc: aspeed: Refactory model data structure Billy Tsai
2021-08-29 15:13 ` Jonathan Cameron
2021-08-24 9:12 ` [RESEND v4 06/15] iio: adc: aspeed: Add vref config function Billy Tsai
2021-08-24 9:12 ` [RESEND v4 07/15] iio: adc: aspeed: Set num_channels with model data Billy Tsai
2021-08-24 9:12 ` [RESEND v4 08/15] iio: adc: aspeed: Use model_data to set clk scaler Billy Tsai
2021-08-24 9:12 ` [RESEND v4 09/15] iio: adc: aspeed: Use devm_add_action_or_reset Billy Tsai
2021-08-24 9:12 ` Billy Tsai
2021-08-24 9:12 ` [RESEND v4 10/15] iio: adc: aspeed: Support ast2600 adc Billy Tsai
2021-08-29 15:31 ` Jonathan Cameron
2021-08-24 9:12 ` [RESEND v4 11/15] iio: adc: aspeed: Fix the calculate error of clock Billy Tsai
2021-08-29 15:33 ` Jonathan Cameron
2021-08-24 9:12 ` [RESEND v4 12/15] iio: adc: aspeed: Add func to set sampling rate Billy Tsai
2021-08-24 9:12 ` [RESEND v4 13/15] iio: adc: aspeed: Add compensation phase Billy Tsai
2021-08-24 9:12 ` [RESEND v4 14/15] iio: adc: aspeed: Support battery sensing Billy Tsai
2021-08-24 9:12 ` [RESEND v4 15/15] iio: adc: aspeed: Get and set trimming data Billy Tsai
[not found] ` <202108250006.17P06IgG097015@twspam01.aspeedtech.com>
2021-08-29 15:20 ` Jonathan Cameron [this message]
[not found] ` <202108250004.17P04FdD094082@twspam01.aspeedtech.com>
2021-08-29 15:25 ` [RESEND v4 09/15] iio: adc: aspeed: Use devm_add_action_or_reset Jonathan Cameron
[not found] ` <202108250003.17P03KRU092474@twspam01.aspeedtech.com>
2021-08-29 15:36 ` [RESEND v4 12/15] iio: adc: aspeed: Add func to set sampling rate Jonathan Cameron
2021-08-30 8:35 ` Billy Tsai
2021-08-30 9:52 ` Jonathan Cameron
[not found] ` <202108250006.17P066YP096721@twspam01.aspeedtech.com>
2021-08-29 15:39 ` [RESEND v4 13/15] iio: adc: aspeed: Add compensation phase Jonathan Cameron
[not found] ` <202108250005.17P05agj096445@twspam01.aspeedtech.com>
2021-08-29 15:43 ` [RESEND v4 14/15] iio: adc: aspeed: Support battery sensing Jonathan Cameron
[not found] ` <202108250007.17P07NFj097422@twspam01.aspeedtech.com>
2021-08-29 15:45 ` [RESEND v4 15/15] iio: adc: aspeed: Get and set trimming data Jonathan Cameron
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=20210829162022.7ee18854@jic23-huawei \
--to=jic23@kernel.org \
--cc=BMC-SW@aspeedtech.com \
--cc=andrew@aj.id.au \
--cc=billy_tsai@aspeedtech.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=joel@jms.id.au \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@kernel.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;
as well as URLs for NNTP newsgroup(s).