From: Jonathan Cameron <jic23@kernel.org>
To: Alexandru Ardelean <aardelean@baylibre.com>
Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, krzk+dt@kernel.org, robh@kernel.org,
lars@metafoo.de, michael.hennerich@analog.com,
gstols@baylibre.com
Subject: Re: [PATCH 1/7] iio: adc: ad7606: add 'bits' parameter to channels macros
Date: Fri, 23 Aug 2024 19:52:51 +0100 [thread overview]
Message-ID: <20240823195251.032c0c22@jic23-huawei> (raw)
In-Reply-To: <20240819064721.91494-2-aardelean@baylibre.com>
On Mon, 19 Aug 2024 09:47:11 +0300
Alexandru Ardelean <aardelean@baylibre.com> wrote:
> There are some newer additions to the AD7606 family, which support 18 bit
> precision.
Hi Alexandru,
> Up until now, all chips were 16 bit.
>
> This change adds a 'bits' parameter to the AD760X_CHANNEL macro and renames
> 'ad7606_channels' -> 'ad7606_channels_16bit' for the current devices.
>
> The AD7606_CHANNEL_PER_CHAN_SCALE() macro is also introduced, as it will
> also require that the number of bits be correctly adjusted (for 18 bit
> parts).
Where is that introduced? There is a _SW_ variant of one macro that isn't
mentioned...
J
>
> Signed-off-by: Alexandru Ardelean <aardelean@baylibre.com>
> ---
> drivers/iio/adc/ad7606.c | 58 ++++++++++++++++++------------------
> drivers/iio/adc/ad7606.h | 18 ++++++-----
> drivers/iio/adc/ad7606_spi.c | 16 +++++-----
> 3 files changed, 47 insertions(+), 45 deletions(-)
>
> diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c
> index 539e4a8621fe..dba1f28782e4 100644
> --- a/drivers/iio/adc/ad7606.c
> +++ b/drivers/iio/adc/ad7606.c
> @@ -333,16 +333,16 @@ static const struct iio_chan_spec ad7605_channels[] = {
> AD7605_CHANNEL(3),
> };
>
> -static const struct iio_chan_spec ad7606_channels[] = {
> +static const struct iio_chan_spec ad7606_channels_16bit[] = {
> IIO_CHAN_SOFT_TIMESTAMP(8),
> - AD7606_CHANNEL(0),
> - AD7606_CHANNEL(1),
> - AD7606_CHANNEL(2),
> - AD7606_CHANNEL(3),
> - AD7606_CHANNEL(4),
> - AD7606_CHANNEL(5),
> - AD7606_CHANNEL(6),
> - AD7606_CHANNEL(7),
> + AD7606_CHANNEL(0, 16),
> + AD7606_CHANNEL(1, 16),
> + AD7606_CHANNEL(2, 16),
> + AD7606_CHANNEL(3, 16),
> + AD7606_CHANNEL(4, 16),
> + AD7606_CHANNEL(5, 16),
> + AD7606_CHANNEL(6, 16),
> + AD7606_CHANNEL(7, 16),
> };
>
> /*
> @@ -357,22 +357,22 @@ static const struct iio_chan_spec ad7606_channels[] = {
> */
> static const struct iio_chan_spec ad7616_channels[] = {
> IIO_CHAN_SOFT_TIMESTAMP(16),
> - AD7606_CHANNEL(0),
> - AD7606_CHANNEL(1),
> - AD7606_CHANNEL(2),
> - AD7606_CHANNEL(3),
> - AD7606_CHANNEL(4),
> - AD7606_CHANNEL(5),
> - AD7606_CHANNEL(6),
> - AD7606_CHANNEL(7),
> - AD7606_CHANNEL(8),
> - AD7606_CHANNEL(9),
> - AD7606_CHANNEL(10),
> - AD7606_CHANNEL(11),
> - AD7606_CHANNEL(12),
> - AD7606_CHANNEL(13),
> - AD7606_CHANNEL(14),
> - AD7606_CHANNEL(15),
> + AD7606_CHANNEL(0, 16),
> + AD7606_CHANNEL(1, 16),
> + AD7606_CHANNEL(2, 16),
> + AD7606_CHANNEL(3, 16),
> + AD7606_CHANNEL(4, 16),
> + AD7606_CHANNEL(5, 16),
> + AD7606_CHANNEL(6, 16),
> + AD7606_CHANNEL(7, 16),
> + AD7606_CHANNEL(8, 16),
> + AD7606_CHANNEL(9, 16),
> + AD7606_CHANNEL(10, 16),
> + AD7606_CHANNEL(11, 16),
> + AD7606_CHANNEL(12, 16),
> + AD7606_CHANNEL(13, 16),
> + AD7606_CHANNEL(14, 16),
> + AD7606_CHANNEL(15, 16),
> };
>
> static const struct ad7606_chip_info ad7606_chip_info_tbl[] = {
> @@ -382,25 +382,25 @@ static const struct ad7606_chip_info ad7606_chip_info_tbl[] = {
> .num_channels = 5,
> },
> [ID_AD7606_8] = {
> - .channels = ad7606_channels,
> + .channels = ad7606_channels_16bit,
> .num_channels = 9,
> .oversampling_avail = ad7606_oversampling_avail,
> .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
> },
> [ID_AD7606_6] = {
> - .channels = ad7606_channels,
> + .channels = ad7606_channels_16bit,
> .num_channels = 7,
> .oversampling_avail = ad7606_oversampling_avail,
> .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
> },
> [ID_AD7606_4] = {
> - .channels = ad7606_channels,
> + .channels = ad7606_channels_16bit,
> .num_channels = 5,
> .oversampling_avail = ad7606_oversampling_avail,
> .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
> },
> [ID_AD7606B] = {
> - .channels = ad7606_channels,
> + .channels = ad7606_channels_16bit,
> .num_channels = 9,
> .oversampling_avail = ad7606_oversampling_avail,
> .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
> diff --git a/drivers/iio/adc/ad7606.h b/drivers/iio/adc/ad7606.h
> index 0c6a88cc4695..771121350f98 100644
> --- a/drivers/iio/adc/ad7606.h
> +++ b/drivers/iio/adc/ad7606.h
> @@ -8,7 +8,7 @@
> #ifndef IIO_ADC_AD7606_H_
> #define IIO_ADC_AD7606_H_
>
> -#define AD760X_CHANNEL(num, mask_sep, mask_type, mask_all) { \
> +#define AD760X_CHANNEL(num, mask_sep, mask_type, mask_all, bits) { \
> .type = IIO_VOLTAGE, \
> .indexed = 1, \
> .channel = num, \
> @@ -19,24 +19,26 @@
> .scan_index = num, \
> .scan_type = { \
> .sign = 's', \
> - .realbits = 16, \
> - .storagebits = 16, \
> + .realbits = (bits), \
> + .storagebits = (bits), \
> .endianness = IIO_CPU, \
> }, \
> }
>
> #define AD7605_CHANNEL(num) \
> AD760X_CHANNEL(num, BIT(IIO_CHAN_INFO_RAW), \
> - BIT(IIO_CHAN_INFO_SCALE), 0)
> + BIT(IIO_CHAN_INFO_SCALE), 0, 16)
>
> -#define AD7606_CHANNEL(num) \
> +#define AD7606_CHANNEL(num, bits) \
> AD760X_CHANNEL(num, BIT(IIO_CHAN_INFO_RAW), \
> BIT(IIO_CHAN_INFO_SCALE), \
> - BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO))
> + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), bits)
>
> -#define AD7616_CHANNEL(num) \
> +#define AD7606_SW_CHANNEL(num, bits) \
> AD760X_CHANNEL(num, BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),\
> - 0, BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO))
> + 0, BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), bits)
> +
> +#define AD7616_CHANNEL(num) AD7606_SW_CHANNEL(num, 16)
>
> /**
> * struct ad7606_chip_info - chip specific information
> diff --git a/drivers/iio/adc/ad7606_spi.c b/drivers/iio/adc/ad7606_spi.c
> index 287a0591533b..dd0075c97c24 100644
> --- a/drivers/iio/adc/ad7606_spi.c
> +++ b/drivers/iio/adc/ad7606_spi.c
> @@ -67,14 +67,14 @@ static const struct iio_chan_spec ad7616_sw_channels[] = {
>
> static const struct iio_chan_spec ad7606b_sw_channels[] = {
> IIO_CHAN_SOFT_TIMESTAMP(8),
> - AD7616_CHANNEL(0),
> - AD7616_CHANNEL(1),
> - AD7616_CHANNEL(2),
> - AD7616_CHANNEL(3),
> - AD7616_CHANNEL(4),
> - AD7616_CHANNEL(5),
> - AD7616_CHANNEL(6),
> - AD7616_CHANNEL(7),
> + AD7606_SW_CHANNEL(0, 16),
> + AD7606_SW_CHANNEL(1, 16),
> + AD7606_SW_CHANNEL(2, 16),
> + AD7606_SW_CHANNEL(3, 16),
> + AD7606_SW_CHANNEL(4, 16),
> + AD7606_SW_CHANNEL(5, 16),
> + AD7606_SW_CHANNEL(6, 16),
> + AD7606_SW_CHANNEL(7, 16),
> };
>
> static const unsigned int ad7606B_oversampling_avail[9] = {
next prev parent reply other threads:[~2024-08-23 18:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-19 6:47 [PATCH 0/7] iio: adc: ad7606: add support for AD7606C-{16,18} parts Alexandru Ardelean
2024-08-19 6:47 ` [PATCH 1/7] iio: adc: ad7606: add 'bits' parameter to channels macros Alexandru Ardelean
2024-08-23 18:52 ` Jonathan Cameron [this message]
2024-08-27 13:53 ` Alexandru Ardelean
2024-08-19 6:47 ` [PATCH 2/7] iio: adc: ad7606: move 'val' pointer to ad7606_scan_direct() Alexandru Ardelean
2024-08-19 6:47 ` [PATCH 3/7] iio: adc: ad7606: split a 'ad7606_sw_mode_setup()' from probe Alexandru Ardelean
2024-08-19 6:47 ` [PATCH 4/7] iio: adc: ad7606: wrap channel ranges & scales into struct Alexandru Ardelean
2024-08-19 6:47 ` [PATCH 5/7] iio: adc: ad7606: rework available attributes for SW channels Alexandru Ardelean
2024-08-19 6:47 ` [PATCH 6/7] dt-bindings: iio: adc: add adi,ad7606c-{16,18} compatible strings Alexandru Ardelean
2024-08-19 13:09 ` Krzysztof Kozlowski
2024-08-20 4:51 ` Alexandru Ardelean
2024-08-21 20:26 ` Jonathan Cameron
2024-08-23 9:09 ` Krzysztof Kozlowski
2024-08-28 10:23 ` Alexandru Ardelean
2024-08-19 6:47 ` [PATCH 7/7] iio: adc: ad7606: add support for AD7606C-{16,18} parts Alexandru Ardelean
2024-08-19 15:07 ` kernel test robot
2024-08-19 15:33 ` David Lechner
2024-08-23 15:54 ` Alexandru Ardelean
2024-08-23 18:04 ` David Lechner
2024-08-23 19:19 ` Jonathan Cameron
2024-08-27 13:53 ` 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=20240823195251.032c0c22@jic23-huawei \
--to=jic23@kernel.org \
--cc=aardelean@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=gstols@baylibre.com \
--cc=krzk+dt@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.hennerich@analog.com \
--cc=robh@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