From: Claudiu Beznea <claudiu.beznea@microchip.com>
To: <eugen.hristev@microchip.com>, <jic23@kernel.org>,
<lars@metafoo.de>, <nicolas.ferre@microchip.com>,
<alexandre.belloni@bootlin.com>, <robh+dt@kernel.org>,
<krzk+dt@kernel.org>, <ludovic.desroches@atmel.com>
Cc: <linux-iio@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Claudiu Beznea <claudiu.beznea@microchip.com>
Subject: [PATCH 06/16] iio: adc: at91-sama5d2_adc: add 64 and 256 oversampling ratio
Date: Thu, 9 Jun 2022 11:32:03 +0300 [thread overview]
Message-ID: <20220609083213.1795019-7-claudiu.beznea@microchip.com> (raw)
In-Reply-To: <20220609083213.1795019-1-claudiu.beznea@microchip.com>
Add 64 and 256 oversampling ratio support. It is necessary for temperature
sensor.
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
drivers/iio/adc/at91-sama5d2_adc.c | 31 +++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
index 7321a4b519af..b52f1020feaf 100644
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -142,6 +142,8 @@ struct at91_adc_reg_layout {
#define AT91_SAMA5D2_EMR_OSR_1SAMPLES 0
#define AT91_SAMA5D2_EMR_OSR_4SAMPLES 1
#define AT91_SAMA5D2_EMR_OSR_16SAMPLES 2
+#define AT91_SAMA5D2_EMR_OSR_64SAMPLES 3
+#define AT91_SAMA5D2_EMR_OSR_256SAMPLES 4
/* Extended Mode Register - Averaging on single trigger event */
#define AT91_SAMA5D2_EMR_ASTE(V) ((V) << 20)
@@ -308,6 +310,8 @@ static const struct at91_adc_reg_layout sama7g5_layout = {
#define AT91_OSR_1SAMPLES 1
#define AT91_OSR_4SAMPLES 4
#define AT91_OSR_16SAMPLES 16
+#define AT91_OSR_64SAMPLES 64
+#define AT91_OSR_256SAMPLES 256
#define AT91_SAMA5D2_CHAN_SINGLE(index, num, addr) \
{ \
@@ -640,7 +644,9 @@ static const struct at91_adc_platform sama7g5_platform = {
.osr_mask = GENMASK(18, 16),
.osr_vals = BIT(AT91_SAMA5D2_EMR_OSR_1SAMPLES) |
BIT(AT91_SAMA5D2_EMR_OSR_4SAMPLES) |
- BIT(AT91_SAMA5D2_EMR_OSR_16SAMPLES),
+ BIT(AT91_SAMA5D2_EMR_OSR_16SAMPLES) |
+ BIT(AT91_SAMA5D2_EMR_OSR_64SAMPLES) |
+ BIT(AT91_SAMA5D2_EMR_OSR_256SAMPLES),
.chan_realbits = 16,
};
@@ -774,6 +780,18 @@ static int at91_adc_config_emr(struct at91_adc_state *st,
emr |= AT91_SAMA5D2_EMR_OSR(AT91_SAMA5D2_EMR_OSR_16SAMPLES,
osr_mask);
break;
+ case AT91_OSR_64SAMPLES:
+ if (!(osr_vals & BIT(AT91_SAMA5D2_EMR_OSR_64SAMPLES)))
+ return -EINVAL;
+ emr |= AT91_SAMA5D2_EMR_OSR(AT91_SAMA5D2_EMR_OSR_64SAMPLES,
+ osr_mask);
+ break;
+ case AT91_OSR_256SAMPLES:
+ if (!(osr_vals & BIT(AT91_SAMA5D2_EMR_OSR_256SAMPLES)))
+ return -EINVAL;
+ emr |= AT91_SAMA5D2_EMR_OSR(AT91_SAMA5D2_EMR_OSR_256SAMPLES,
+ osr_mask);
+ break;
}
at91_adc_writel(st, EMR, emr);
@@ -791,6 +809,10 @@ static int at91_adc_adjust_val_osr(struct at91_adc_state *st, int *val)
nbits = 13;
else if (st->oversampling_ratio == AT91_OSR_16SAMPLES)
nbits = 14;
+ else if (st->oversampling_ratio == AT91_OSR_64SAMPLES)
+ nbits = 15;
+ else if (st->oversampling_ratio == AT91_OSR_256SAMPLES)
+ nbits = 16;
/*
* We have nbits of real data and channel is registered as
@@ -1679,7 +1701,8 @@ static int at91_adc_write_raw(struct iio_dev *indio_dev,
switch (mask) {
case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
if ((val != AT91_OSR_1SAMPLES) && (val != AT91_OSR_4SAMPLES) &&
- (val != AT91_OSR_16SAMPLES))
+ (val != AT91_OSR_16SAMPLES) && (val != AT91_OSR_64SAMPLES) &&
+ (val != AT91_OSR_256SAMPLES))
return -EINVAL;
/* if no change, optimize out */
mutex_lock(&st->lock);
@@ -1897,7 +1920,9 @@ static IIO_CONST_ATTR(hwfifo_watermark_max, AT91_HWFIFO_MAX_SIZE_STR);
static IIO_CONST_ATTR(oversampling_ratio_available,
__stringify(AT91_OSR_1SAMPLES) " "
__stringify(AT91_OSR_4SAMPLES) " "
- __stringify(AT91_OSR_16SAMPLES));
+ __stringify(AT91_OSR_16SAMPLES) " "
+ __stringify(AT91_OSR_64SAMPLES) " "
+ __stringify(AT91_OSR_256SAMPLES));
static struct attribute *at91_adc_attributes[] = {
&iio_const_attr_oversampling_ratio_available.dev_attr.attr,
--
2.34.1
next prev parent reply other threads:[~2022-06-09 8:30 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-09 8:31 [PATCH 00/16] iio: adc: at91-sama5d2_adc: add support for temperature sensor Claudiu Beznea
2022-06-09 8:31 ` [PATCH 01/16] iio: adc: at91-sama5d2_adc: fix AT91_SAMA5D2_MR_TRACKTIM_MAX Claudiu Beznea
2022-06-09 8:31 ` [PATCH 02/16] iio: adc: at91-sama5d2_adc: lock around oversampling and sample freq Claudiu Beznea
2022-06-11 17:30 ` Jonathan Cameron
2022-06-14 8:19 ` Claudiu.Beznea
2022-06-09 8:32 ` [PATCH 03/16] iio: adc: at91-sama5d2_adc: exit from write_raw() when buffers are enabled Claudiu Beznea
2022-06-11 17:33 ` Jonathan Cameron
2022-06-14 8:19 ` Claudiu.Beznea
2022-06-09 8:32 ` [PATCH 04/16] iio: adc: at91-sama5d2_adc: handle different EMR.OSR for different hw versions Claudiu Beznea
2022-06-11 17:46 ` Jonathan Cameron
2022-06-14 8:20 ` Claudiu.Beznea
2022-06-09 8:32 ` [PATCH 05/16] iio: adc: at91-sama5d2_adc: adjust osr based on specific platform data Claudiu Beznea
2022-06-09 8:32 ` Claudiu Beznea [this message]
2022-06-11 17:47 ` [PATCH 06/16] iio: adc: at91-sama5d2_adc: add 64 and 256 oversampling ratio Jonathan Cameron
2022-06-14 8:22 ` Claudiu.Beznea
2022-06-09 8:32 ` [PATCH 07/16] iio: adc: at91-sama5d2_adc: simplify the code in at91_adc_read_info_raw() Claudiu Beznea
2022-06-11 17:54 ` Jonathan Cameron
2022-06-14 8:49 ` Claudiu.Beznea
2022-06-14 12:00 ` Jonathan Cameron
2022-06-09 8:32 ` [PATCH 08/16] iio: adc: at91-sama5d2_adc: move oversampling storage in its function Claudiu Beznea
2022-06-09 8:32 ` [PATCH 09/16] iio: adc: at91-sama5d2_adc: update trackx on emr Claudiu Beznea
2022-06-09 8:32 ` [PATCH 10/16] iio: adc: at91-sama5d2_adc: add startup and tracktim as parameter for at91_adc_setup_samp_freq() Claudiu Beznea
2022-06-09 8:32 ` [PATCH 11/16] iio: adc: at91-sama5d2_adc: add locking parameter to at91_adc_read_info_raw() Claudiu Beznea
2022-06-11 17:58 ` Jonathan Cameron
2022-06-14 8:50 ` Claudiu.Beznea
2022-06-14 12:02 ` Jonathan Cameron
2022-06-09 8:32 ` [PATCH 12/16] dt-bindings: iio: adc: at91-sama5d2_adc: add id for temperature channel Claudiu Beznea
2022-06-16 16:00 ` Rob Herring
2022-06-09 8:32 ` [PATCH 13/16] iio: adc: at91-sama5d2_adc: add support for temperature sensor Claudiu Beznea
2022-06-11 18:15 ` Jonathan Cameron
2022-06-14 10:13 ` Claudiu.Beznea
2022-06-14 12:10 ` Jonathan Cameron
2022-06-09 8:32 ` [PATCH 14/16] iio: adc: at91-sama5d2_adc: add empty line after functions Claudiu Beznea
2022-06-09 8:32 ` [PATCH 15/16] iio: adc: at91-sama5d2_adc: add runtime pm support Claudiu Beznea
2022-06-11 16:48 ` Jonathan Cameron
2022-06-14 10:40 ` Claudiu.Beznea
2022-06-14 12:14 ` Jonathan Cameron
2022-06-09 8:32 ` [PATCH 16/16] iio: adc: at91-sama5d2_adc: use pm_ptr() Claudiu Beznea
2022-06-11 16:40 ` Jonathan Cameron
2022-06-11 18:16 ` [PATCH 00/16] iio: adc: at91-sama5d2_adc: add support for temperature sensor Jonathan Cameron
2022-06-14 10:41 ` Claudiu.Beznea
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=20220609083213.1795019-7-claudiu.beznea@microchip.com \
--to=claudiu.beznea@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=eugen.hristev@microchip.com \
--cc=jic23@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.desroches@atmel.com \
--cc=nicolas.ferre@microchip.com \
--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