From: Renato Lui Geh <renatogeh@gmail.com>
To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org,
knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org,
stefan.popa@analog.com, alexandru.Ardelean@analog.com,
giuliano.belinassi@usp.br, robh+dt@kernel.org,
mark.rutland@arm.com
Cc: linux-iio@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, kernel-usp@googlegroups.com,
devicetree@vger.kernel.org
Subject: [PATCH v4 2/9] staging: iio: ad7780: add filter reading to ad778x
Date: Thu, 28 Feb 2019 11:24:10 -0300 [thread overview]
Message-ID: <a44c3316553c3cab4378d7e31c2d1914bf558c62.1551358569.git.renatogeh@gmail.com> (raw)
In-Reply-To: <cover.1551358569.git.renatogeh@gmail.com>
This patch adds the new feature of reading the filter odr value for
ad778x chips. This value is stored in the chip's state struct whenever a
read or write call is performed on the chip's driver.
This feature requires sharing SAMP_FREQ. Since the ad717x does not have
a filter option, the driver only shares the relevant info mask for the
ad778x family.
Signed-off-by: Renato Lui Geh <renatogeh@gmail.com>
---
Changes in v4:
- As mentioned in the previous patch, this was originally as part of
the 'add gain & filter gpio support' patch
drivers/staging/iio/adc/ad7780.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c
index 87fbcf510d45..7a68e90ddf14 100644
--- a/drivers/staging/iio/adc/ad7780.c
+++ b/drivers/staging/iio/adc/ad7780.c
@@ -59,6 +59,7 @@ struct ad7780_state {
struct gpio_desc *gain_gpio;
struct gpio_desc *filter_gpio;
unsigned int gain;
+ unsigned int odr;
unsigned int int_vref_mv;
struct ad_sigma_delta sd;
@@ -121,6 +122,9 @@ static int ad7780_read_raw(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_OFFSET:
*val = -(1 << (chan->scan_type.realbits - 1));
return IIO_VAL_INT;
+ case IIO_CHAN_INFO_SAMP_FREQ:
+ *val = st->odr;
+ return IIO_VAL_INT;
default:
break;
}
@@ -163,6 +167,7 @@ static int ad7780_write_raw(struct iio_dev *indio_dev,
val = 0;
else
val = 1;
+ st->odr = ad778x_odr_avail[val];
gpiod_set_value(st->filter_gpio, val);
break;
default:
@@ -184,6 +189,7 @@ static int ad7780_postprocess_sample(struct ad_sigma_delta *sigma_delta,
if (chip_info->is_ad778x) {
st->gain = ad778x_gain[raw_sample & AD7780_GAIN];
+ st->odr = ad778x_odr_avail[raw_sample & AD7780_FILTER];
}
return 0;
@@ -196,17 +202,19 @@ static const struct ad_sigma_delta_info ad7780_sigma_delta_info = {
};
#define AD7780_CHANNEL(bits, wordsize) \
+ AD_SD_CHANNEL(1, 0, 0, bits, 32, wordsize - bits)
+#define AD7170_CHANNEL(bits, wordsize) \
AD_SD_CHANNEL_NO_SAMP_FREQ(1, 0, 0, bits, 32, wordsize - bits)
static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {
[ID_AD7170] = {
- .channel = AD7780_CHANNEL(12, 24),
+ .channel = AD7170_CHANNEL(12, 24),
.pattern = AD7170_PATTERN,
.pattern_mask = AD7170_PATTERN_MASK,
.is_ad778x = false,
},
[ID_AD7171] = {
- .channel = AD7780_CHANNEL(16, 24),
+ .channel = AD7170_CHANNEL(16, 24),
.pattern = AD7170_PATTERN,
.pattern_mask = AD7170_PATTERN_MASK,
.is_ad778x = false,
--
2.21.0
next prev parent reply other threads:[~2019-02-28 14:24 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 14:23 [PATCH v4 0/9] staging: iio: ad7780: move out of staging Renato Lui Geh
2019-02-28 14:23 ` [PATCH v4 1/9] staging: iio: ad7780: add gain & filter gpio support Renato Lui Geh
2019-03-01 6:56 ` Ardelean, Alexandru
2019-03-01 7:42 ` Dan Carpenter
2019-03-02 19:03 ` Jonathan Cameron
2019-02-28 14:24 ` Renato Lui Geh [this message]
2019-03-01 6:59 ` [PATCH v4 2/9] staging: iio: ad7780: add filter reading to ad778x Ardelean, Alexandru
2019-02-28 14:24 ` [PATCH v4 3/9] staging: iio: ad7780: set pattern values and masks directly Renato Lui Geh
2019-03-01 7:17 ` Ardelean, Alexandru
2019-03-02 19:07 ` Jonathan Cameron
2019-03-02 19:08 ` Jonathan Cameron
2019-03-04 7:19 ` Ardelean, Alexandru
2019-02-28 14:24 ` [PATCH v4 4/9] staging:iio:ad7780: add chip ID values and mask Renato Lui Geh
2019-03-01 7:20 ` Ardelean, Alexandru
2019-03-03 14:01 ` Renato Lui Geh
2019-03-03 14:53 ` Jonathan Cameron
2019-03-04 7:33 ` Ardelean, Alexandru
2019-03-09 0:19 ` Renato Lui Geh
2019-03-09 17:47 ` Jonathan Cameron
2019-02-28 14:25 ` [PATCH v4 5/9] staging: iio: ad7780: move regulator to after GPIO init Renato Lui Geh
2019-03-01 7:38 ` Ardelean, Alexandru
2019-03-02 19:11 ` Jonathan Cameron
2019-03-04 7:20 ` Ardelean, Alexandru
2019-02-28 14:25 ` [PATCH v4 6/9] staging: iio: ad7780: add SPDX identifier Renato Lui Geh
2019-02-28 14:25 ` [PATCH v4 7/9] staging: iio: ad7780: add new copyright holder Renato Lui Geh
2019-02-28 14:26 ` [PATCH v4 8/9] staging: iio: ad7780: moving ad7780 out of staging Renato Lui Geh
2019-03-02 19:17 ` Jonathan Cameron
2019-02-28 14:26 ` [PATCH v4 9/9] staging: iio: ad7780: add device tree binding Renato Lui Geh
2019-03-02 19:13 ` Jonathan Cameron
2019-03-11 22:47 ` Rob Herring
2019-03-01 8:35 ` [PATCH v4 0/9] staging: iio: ad7780: move out of staging Ardelean, Alexandru
2019-03-03 13:52 ` Renato Lui Geh
2019-03-03 14:32 ` Alexandru Ardelean
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=a44c3316553c3cab4378d7e31c2d1914bf558c62.1551358569.git.renatogeh@gmail.com \
--to=renatogeh@gmail.com \
--cc=Michael.Hennerich@analog.com \
--cc=alexandru.Ardelean@analog.com \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree@vger.kernel.org \
--cc=giuliano.belinassi@usp.br \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@kernel.org \
--cc=kernel-usp@googlegroups.com \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@kernel.org \
--cc=stefan.popa@analog.com \
/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).