Devicetree
 help / color / mirror / Atom feed
From: Guillaume Stols <gstols@baylibre.com>
To: Lars-Peter Clausen <lars@metafoo.de>,
	 Michael Hennerich <Michael.Hennerich@analog.com>,
	 Jonathan Cameron <jic23@kernel.org>,
	Rob Herring <robh@kernel.org>,
	 Krzysztof Kozlowski <krzk+dt@kernel.org>,
	 Conor Dooley <conor+dt@kernel.org>
Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
	 Michael Hennerich <michael.hennerich@analog.com>,
	 linux-fbdev@vger.kernel.org, devicetree@vger.kernel.org,
	 Jonathan Cameron <Jonathan.Cameron@huawei.com>,
	 Guillaume Stols <gstols@baylibre.com>,
	jstephan@baylibre.com,  dlechner@baylibre.com
Subject: [PATCH v3 6/8] iio: adc: ad7606: fix oversampling gpio array
Date: Tue, 02 Jul 2024 17:34:10 +0000	[thread overview]
Message-ID: <20240702-cleanup-ad7606-v3-6-57fd02a4e2aa@baylibre.com> (raw)
In-Reply-To: <20240702-cleanup-ad7606-v3-0-57fd02a4e2aa@baylibre.com>

gpiod_set_array_value was misused here: the implementation relied on the
assumption that an unsigned long was required for each gpio, while the
function expects a bit array stored in "as much unsigned long as needed
for storing one bit per GPIO", i.e it is using a bit field.

This leaded to incorrect parameter passed to gpiod_set_array_value, that
would set 1 value instead of 3.
It also prevents to select the software mode correctly for the AD7606B.

Fixes: d2a415c86c6b ("iio: adc: ad7606: Add support for AD7606B ADC")
Fixes: 41f71e5e7daf ("staging: iio: adc: ad7606: Use find_closest() macro")
Signed-off-by: Guillaume Stols <gstols@baylibre.com>
---
 drivers/iio/adc/ad7606.c     | 4 ++--
 drivers/iio/adc/ad7606_spi.c | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c
index 3a417595294f..8cce1fad9763 100644
--- a/drivers/iio/adc/ad7606.c
+++ b/drivers/iio/adc/ad7606.c
@@ -236,9 +236,9 @@ static int ad7606_write_os_hw(struct iio_dev *indio_dev, int val)
 	struct ad7606_state *st = iio_priv(indio_dev);
 	DECLARE_BITMAP(values, 3);
 
-	values[0] = val;
+	values[0] = val & GENMASK(2, 0);
 
-	gpiod_set_array_value(ARRAY_SIZE(values), st->gpio_os->desc,
+	gpiod_set_array_value(st->gpio_os->ndescs, st->gpio_os->desc,
 			      st->gpio_os->info, values);
 
 	/* AD7616 requires a reset to update value */
diff --git a/drivers/iio/adc/ad7606_spi.c b/drivers/iio/adc/ad7606_spi.c
index 263a778bcf25..287a0591533b 100644
--- a/drivers/iio/adc/ad7606_spi.c
+++ b/drivers/iio/adc/ad7606_spi.c
@@ -249,8 +249,9 @@ static int ad7616_sw_mode_config(struct iio_dev *indio_dev)
 static int ad7606B_sw_mode_config(struct iio_dev *indio_dev)
 {
 	struct ad7606_state *st = iio_priv(indio_dev);
-	unsigned long os[3] = {1};
+	DECLARE_BITMAP(os, 3);
 
+	bitmap_fill(os, 3);
 	/*
 	 * Software mode is enabled when all three oversampling
 	 * pins are set to high. If oversampling gpios are defined
@@ -258,7 +259,7 @@ static int ad7606B_sw_mode_config(struct iio_dev *indio_dev)
 	 * otherwise, they must be hardwired to VDD
 	 */
 	if (st->gpio_os) {
-		gpiod_set_array_value(ARRAY_SIZE(os),
+		gpiod_set_array_value(st->gpio_os->ndescs,
 				      st->gpio_os->desc, st->gpio_os->info, os);
 	}
 	/* OS of 128 and 256 are available only in software mode */

-- 
2.34.1


  parent reply	other threads:[~2024-07-02 17:34 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-02 17:34 [PATCH v3 0/8] iio: adc: ad7606: Improvements Guillaume Stols
2024-07-02 17:34 ` [PATCH v3 1/8] dt-bindings: iio: adc: adi,ad7606: normalize textwidth Guillaume Stols
2024-07-02 17:34 ` [PATCH v3 2/8] dt-bindings: iio: adc: adi,ad7606: improve descriptions Guillaume Stols
2024-07-02 17:34 ` [PATCH v3 3/8] dt-bindings: iio: adc: adi,ad7606: add supply properties Guillaume Stols
2024-07-02 17:34 ` [PATCH v3 4/8] dt-bindings: iio: adc: adi,ad7606: fix example Guillaume Stols
2024-07-02 17:34 ` [PATCH v3 5/8] dt-bindings: iio: adc: adi,ad7606: add conditions Guillaume Stols
2024-07-02 17:34 ` Guillaume Stols [this message]
2024-07-03 11:08   ` [PATCH v3 6/8] iio: adc: ad7606: fix oversampling gpio array Nuno Sá
2024-07-02 17:34 ` [PATCH v3 7/8] iio: adc: ad7606: fix standby gpio state to match the documentation Guillaume Stols
2024-07-03 11:09   ` Nuno Sá
2024-07-02 17:34 ` [PATCH v3 8/8] iio: adc: ad7606: switch mutexes to scoped_guard Guillaume Stols
2024-07-03 11:12   ` Nuno Sá
2024-07-06 12:56   ` Markus Elfring
2024-07-06 12:15 ` [PATCH v3 0/8] iio: adc: ad7606: Improvements Jonathan Cameron
2024-07-06 12:29   ` Konstantin Ryabitsev
2024-07-07 10:38     ` Jonathan Cameron
2024-07-07 11:03 ` 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=20240702-cleanup-ad7606-v3-6-57fd02a4e2aa@baylibre.com \
    --to=gstols@baylibre.com \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=Michael.Hennerich@analog.com \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=dlechner@baylibre.com \
    --cc=jic23@kernel.org \
    --cc=jstephan@baylibre.com \
    --cc=krzk+dt@kernel.org \
    --cc=lars@metafoo.de \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --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