iio: adc: ad7606: fix oversampling gpio array

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>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c
index 3a417595294f78582c2842253c5b838c283b4df6..8cce1fad9763d6cf789a112b76cd5b8bbdf24af5 100644 (file)
--- 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 263a778bcf2539a3b6a6ce6f44b386367a1895d2..287a0591533b6a57b6ef6ea0622b3bc72c635f10 100644 (file)
--- 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 */