linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Billy Tsai <billy_tsai@aspeedtech.com>
To: <jic23@kernel.org>, <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>
Cc: <BMC-SW@aspeedtech.com>
Subject: [v5 11/15] iio: adc: aspeed: Fix the calculate error of clock.
Date: Tue, 31 Aug 2021 15:14:54 +0800	[thread overview]
Message-ID: <20210831071458.2334-12-billy_tsai@aspeedtech.com> (raw)
In-Reply-To: <20210831071458.2334-1-billy_tsai@aspeedtech.com>

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 40b7ba58c1dc..349377b9fac0 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;
@@ -204,6 +211,13 @@ static void aspeed_adc_unregister_divider(void *data)
 	clk_hw_unregister_divider(clk);
 }
 
+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;
@@ -328,6 +342,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);
+	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


  parent reply	other threads:[~2021-08-31  7:14 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-31  7:14 [v5 00/15] Add support for ast2600 ADC Billy Tsai
2021-08-31  7:14 ` [v5 01/15] iio: adc: aspeed: set driver data when adc probe Billy Tsai
2021-09-05 14:25   ` Jonathan Cameron
2021-08-31  7:14 ` [v5 02/15] dt-bindings: iio: adc: Add ast2600-adc bindings Billy Tsai
2021-09-01  1:38   ` Rob Herring
2021-09-05 14:27     ` Jonathan Cameron
2021-08-31  7:14 ` [v5 03/15] iio: adc: aspeed: completes the bitfield declare Billy Tsai
2021-09-05 14:30   ` Jonathan Cameron
2021-08-31  7:14 ` [v5 04/15] iio: adc: aspeed: Keep model data to driver data Billy Tsai
2021-09-05 14:33   ` Jonathan Cameron
2021-09-05 14:50     ` Jonathan Cameron
2021-09-16  3:52       ` Joel Stanley
2021-09-18 17:55         ` Jonathan Cameron
2021-08-31  7:14 ` [v5 05/15] iio: adc: aspeed: Refactory model data structure Billy Tsai
2021-09-05 14:37   ` Jonathan Cameron
2021-08-31  7:14 ` [v5 06/15] iio: adc: aspeed: Add vref config function Billy Tsai
2021-08-31  7:14 ` [v5 07/15] iio: adc: aspeed: Set num_channels with model data Billy Tsai
2021-08-31  7:14 ` [v5 08/15] iio: adc: aspeed: Use model_data to set clk scaler Billy Tsai
2021-08-31  7:14 ` [v5 09/15] iio: adc: aspeed: Use devm_add_action_or_reset Billy Tsai
2021-08-31  7:51   ` Philipp Zabel
2021-08-31  7:14 ` [v5 10/15] iio: adc: aspeed: Support ast2600 adc Billy Tsai
2021-08-31  7:14 ` Billy Tsai [this message]
2021-09-05 14:47   ` [v5 11/15] iio: adc: aspeed: Fix the calculate error of clock Jonathan Cameron
2021-08-31  7:14 ` [v5 12/15] iio: adc: aspeed: Add func to set sampling rate Billy Tsai
2021-08-31  7:14 ` [v5 13/15] iio: adc: aspeed: Add compensation phase Billy Tsai
2021-08-31  7:14 ` [v5 14/15] iio: adc: aspeed: Support battery sensing Billy Tsai
2021-08-31  7:14 ` [v5 15/15] 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=20210831071458.2334-12-billy_tsai@aspeedtech.com \
    --to=billy_tsai@aspeedtech.com \
    --cc=BMC-SW@aspeedtech.com \
    --cc=andrew@aj.id.au \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=jic23@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).