All of lore.kernel.org
 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: [RESEND v4 14/15] iio: adc: aspeed: Support battery sensing.
Date: Tue, 24 Aug 2021 17:12:42 +0800	[thread overview]
Message-ID: <202108250003.17P03b7S092989@twspam01.aspeedtech.com> (raw)
In-Reply-To: <20210824091243.9393-1-billy_tsai@aspeedtech.com>

In ast2600, ADC integrate dividing circuit at last input channel for
battery sensing. This patch use the dts property "battery-sensing" to
enable this feature makes the last channel of each adc can tolerance
higher voltage than reference voltage.

Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com>
---
 drivers/iio/adc/aspeed_adc.c | 62 +++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 5 deletions(-)

diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c
index 20caf28dff18..0c5d84e82561 100644
--- a/drivers/iio/adc/aspeed_adc.c
+++ b/drivers/iio/adc/aspeed_adc.c
@@ -79,10 +79,16 @@ struct aspeed_adc_model_data {
 	unsigned int vref_fixed;	// mV
 	bool wait_init_sequence;
 	bool need_prescaler;
+	bool bat_sense_sup;
 	u8 scaler_bit_width;
 	unsigned int num_channels;
 };
 
+struct adc_gain {
+	u8 mult;
+	u8 div;
+};
+
 struct aspeed_adc_data {
 	struct device		*dev;
 	const struct aspeed_adc_model_data *model_data;
@@ -96,6 +102,8 @@ struct aspeed_adc_data {
 	int			vref;
 	u32			sample_period_ns;
 	int			cv;
+	bool			battery_sensing;
+	struct adc_gain		battery_mode_gain;
 };
 
 #define ASPEED_CHAN(_idx, _data_reg_addr) {			\
@@ -103,10 +111,10 @@ struct aspeed_adc_data {
 	.indexed = 1,						\
 	.channel = (_idx),					\
 	.address = (_data_reg_addr),				\
-	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),		\
-	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |	\
-				BIT(IIO_CHAN_INFO_SAMP_FREQ) |	\
+	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |		\
 				BIT(IIO_CHAN_INFO_OFFSET),	\
+	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |	\
+				BIT(IIO_CHAN_INFO_SAMP_FREQ),	\
 }
 
 static const struct iio_chan_spec aspeed_adc_iio_channels[] = {
@@ -196,14 +204,39 @@ static int aspeed_adc_read_raw(struct iio_dev *indio_dev,
 			       int *val, int *val2, long mask)
 {
 	struct aspeed_adc_data *data = iio_priv(indio_dev);
+	u32 adc_engine_control_reg_val;
 
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
-		*val = readw(data->base + chan->address);
+		if (data->battery_sensing && chan->channel == 7) {
+			adc_engine_control_reg_val =
+				readl(data->base + ASPEED_REG_ENGINE_CONTROL);
+			writel(adc_engine_control_reg_val |
+				       FIELD_PREP(ASPEED_ADC_CH7_MODE,
+						  ASPEED_ADC_CH7_BAT) |
+				       ASPEED_ADC_BAT_SENSING_ENABLE,
+			       data->base + ASPEED_REG_ENGINE_CONTROL);
+			/*
+			 * After enable battery sensing mode need to wait some time for adc stable
+			 * Experiment result is 1ms.
+			 */
+			mdelay(1);
+			*val = readw(data->base + chan->address);
+			*val = (*val * data->battery_mode_gain.mult) /
+			       data->battery_mode_gain.div;
+			/* Restore control register value */
+			writel(adc_engine_control_reg_val,
+			       data->base + ASPEED_REG_ENGINE_CONTROL);
+		} else
+			*val = readw(data->base + chan->address);
 		return IIO_VAL_INT;
 
 	case IIO_CHAN_INFO_OFFSET:
-		*val = data->cv;
+		if (data->battery_sensing && chan->channel == 7)
+			*val = (data->cv * data->battery_mode_gain.mult) /
+			       data->battery_mode_gain.div;
+		else
+			*val = data->cv;
 		return IIO_VAL_INT;
 
 	case IIO_CHAN_INFO_SCALE:
@@ -473,6 +506,23 @@ static int aspeed_adc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
+	if (of_find_property(data->dev->of_node, "aspeed,battery-sensing",
+			     NULL)) {
+		if (data->model_data->bat_sense_sup) {
+			data->battery_sensing = 1;
+			if (readl(data->base + ASPEED_REG_ENGINE_CONTROL) &
+			ASPEED_ADC_BAT_SENSING_DIV) {
+				data->battery_mode_gain.mult = 3;
+				data->battery_mode_gain.div = 1;
+			} else {
+				data->battery_mode_gain.mult = 3;
+				data->battery_mode_gain.div = 2;
+			}
+		} else
+			dev_warn(&pdev->dev,
+				"Failed to enable battey-sensing mode\n");
+	}
+
 	if (data->model_data->wait_init_sequence) {
 		adc_engine_control_reg_val =
 			readl(data->base + ASPEED_REG_ENGINE_CONTROL);
@@ -555,6 +605,7 @@ static const struct aspeed_adc_model_data ast2600_adc0_model_data = {
 	.min_sampling_rate = 10000,
 	.max_sampling_rate = 500000,
 	.wait_init_sequence = true,
+	.bat_sense_sup = true,
 	.scaler_bit_width = 16,
 	.num_channels = 8,
 };
@@ -564,6 +615,7 @@ static const struct aspeed_adc_model_data ast2600_adc1_model_data = {
 	.min_sampling_rate = 10000,
 	.max_sampling_rate = 500000,
 	.wait_init_sequence = true,
+	.bat_sense_sup = true,
 	.scaler_bit_width = 16,
 	.num_channels = 8,
 };
-- 
2.25.1


  parent reply	other threads:[~2021-08-25  0:22 UTC|newest]

Thread overview: 76+ 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 ` 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   ` Billy Tsai
2021-08-24  9:12 ` [RESEND v4 02/15] iio: adc: aspeed: completes the bitfield declare Billy Tsai
2021-08-24  9:12   ` Billy Tsai
2021-08-29 15:07   ` Jonathan Cameron
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-24  9:12   ` Billy Tsai
2021-08-29 15:08   ` Jonathan Cameron
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   ` Billy Tsai
2021-08-24  9:12 ` [RESEND v4 05/15] iio: adc: aspeed: Refactory model data structure Billy Tsai
2021-08-24  9:12   ` Billy Tsai
2021-08-29 15:13   ` Jonathan Cameron
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   ` 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   ` 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-25 11:52   ` kernel test robot
2021-08-25 11:52     ` kernel test robot
2021-08-24  9:12 ` Billy Tsai
2021-08-24  9:12 ` Billy Tsai
2021-08-24  9:12 ` 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 ` Billy Tsai
2021-08-24  9:12 ` Billy Tsai
2021-08-24  9:12 ` Billy Tsai
2021-08-24  9:12 ` 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-24  9:12   ` Billy Tsai
2021-08-29 15:31   ` Jonathan Cameron
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-24  9:12   ` Billy Tsai
2021-08-29 15:33   ` Jonathan Cameron
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 ` Billy Tsai
2021-08-24  9:12 ` Billy Tsai
2021-08-24  9:12 ` Billy Tsai
2021-08-29 15:36   ` Jonathan Cameron
2021-08-29 15:36     ` Jonathan Cameron
2021-08-30  8:35     ` Billy Tsai
2021-08-30  8:35       ` Billy Tsai
2021-08-30  9:52       ` Jonathan Cameron
2021-08-30  9:52         ` Jonathan Cameron
2021-08-24  9:12 ` [RESEND v4 13/15] iio: adc: aspeed: Add compensation phase Billy Tsai
2021-08-24  9:12 ` Billy Tsai
2021-08-24  9:12 ` Billy Tsai
2021-08-24  9:12 ` Billy Tsai
2021-08-24  9:12 ` [RESEND v4 14/15] iio: adc: aspeed: Support battery sensing Billy Tsai
2021-08-24  9:12 ` Billy Tsai [this message]
2021-08-24  9:12 ` Billy Tsai
2021-08-29 15:43   ` Jonathan Cameron
2021-08-29 15:43     ` Jonathan Cameron
2021-08-24  9:12 ` Billy Tsai
2021-08-24  9:12 ` [RESEND v4 15/15] iio: adc: aspeed: Get and set trimming data Billy Tsai
2021-08-24  9:12 ` Billy Tsai
2021-08-24  9:12 ` Billy Tsai
2021-08-24  9:12 ` Billy Tsai
2021-08-24  9:12 ` Billy Tsai
     [not found] ` <202108250006.17P06IgG097015@twspam01.aspeedtech.com>
2021-08-29 15:20   ` [RESEND v4 08/15] iio: adc: aspeed: Use model_data to set clk scaler Jonathan Cameron
2021-08-29 15:20     ` Jonathan Cameron
     [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
2021-08-29 15:25     ` 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
2021-08-29 15:39     ` 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
2021-08-29 15:45     ` 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=202108250003.17P03b7S092989@twspam01.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.