| Message ID | 20241210-ad7606_add_iio_backend_software_mode-v2-1-6619c3e50d81@baylibre.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Add support for Software mode on AD7606's iio backend driver | expand |
On Tue, 10 Dec 2024 10:46:41 +0000 Guillaume Stols <gstols@baylibre.com> wrote: > When introducing num_adc_channels, I overlooked some new functions > created in a meanwhile that had also the hardcoded offset. This commit > adds the new logic to these functions. > > Fixes: 7a671afeb592 ("iio: adc: ad7606: Introduce num_adc_channels") > Signed-off-by: Guillaume Stols <gstols@baylibre.com> Applied this patch to the fixes-togreg branch of iio.git. That may well stall the rest for a while though whilst that works its way around into the upstream for the togreg branch. Thanks, Jonathan > --- > drivers/iio/adc/ad7606.c | 48 ++++++++++++++++++++++++++++-------------------- > drivers/iio/adc/ad7606.h | 2 +- > 2 files changed, 29 insertions(+), 21 deletions(-) > > diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c > index e35d55d03d86..d8e3c7a43678 100644 > --- a/drivers/iio/adc/ad7606.c > +++ b/drivers/iio/adc/ad7606.c > @@ -175,17 +175,17 @@ static const struct iio_chan_spec ad7616_channels[] = { > AD7606_CHANNEL(15, 16), > }; > > -static int ad7606c_18bit_chan_scale_setup(struct ad7606_state *st, > +static int ad7606c_18bit_chan_scale_setup(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch); > -static int ad7606c_16bit_chan_scale_setup(struct ad7606_state *st, > +static int ad7606c_16bit_chan_scale_setup(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch); > -static int ad7606_16bit_chan_scale_setup(struct ad7606_state *st, > +static int ad7606_16bit_chan_scale_setup(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch); > -static int ad7607_chan_scale_setup(struct ad7606_state *st, > +static int ad7607_chan_scale_setup(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch); > -static int ad7608_chan_scale_setup(struct ad7606_state *st, > +static int ad7608_chan_scale_setup(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch); > -static int ad7609_chan_scale_setup(struct ad7606_state *st, > +static int ad7609_chan_scale_setup(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch); > > const struct ad7606_chip_info ad7605_4_info = { > @@ -323,9 +323,10 @@ int ad7606_reset(struct ad7606_state *st) > } > EXPORT_SYMBOL_NS_GPL(ad7606_reset, "IIO_AD7606"); > > -static int ad7606_16bit_chan_scale_setup(struct ad7606_state *st, > +static int ad7606_16bit_chan_scale_setup(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch) > { > + struct ad7606_state *st = iio_priv(indio_dev); > struct ad7606_chan_scale *cs = &st->chan_scales[ch]; > > if (!st->sw_mode_en) { > @@ -345,10 +346,12 @@ static int ad7606_16bit_chan_scale_setup(struct ad7606_state *st, > return 0; > } > > -static int ad7606_get_chan_config(struct ad7606_state *st, int ch, > +static int ad7606_get_chan_config(struct iio_dev *indio_dev, int ch, > bool *bipolar, bool *differential) > { > - unsigned int num_channels = st->chip_info->num_channels - 1; > + struct ad7606_state *st = iio_priv(indio_dev); > + unsigned int num_channels = st->chip_info->num_adc_channels; > + unsigned int offset = indio_dev->num_channels - st->chip_info->num_adc_channels; > struct device *dev = st->dev; > int ret; > > @@ -364,7 +367,7 @@ static int ad7606_get_chan_config(struct ad7606_state *st, int ch, > continue; > > /* channel number (here) is from 1 to num_channels */ > - if (reg == 0 || reg > num_channels) { > + if (reg < offset || reg > num_channels) { > dev_warn(dev, > "Invalid channel number (ignoring): %d\n", reg); > continue; > @@ -399,9 +402,10 @@ static int ad7606_get_chan_config(struct ad7606_state *st, int ch, > return 0; > } > > -static int ad7606c_18bit_chan_scale_setup(struct ad7606_state *st, > +static int ad7606c_18bit_chan_scale_setup(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch) > { > + struct ad7606_state *st = iio_priv(indio_dev); > struct ad7606_chan_scale *cs = &st->chan_scales[ch]; > bool bipolar, differential; > int ret; > @@ -413,7 +417,7 @@ static int ad7606c_18bit_chan_scale_setup(struct ad7606_state *st, > return 0; > } > > - ret = ad7606_get_chan_config(st, ch, &bipolar, &differential); > + ret = ad7606_get_chan_config(indio_dev, ch, &bipolar, &differential); > if (ret) > return ret; > > @@ -455,9 +459,10 @@ static int ad7606c_18bit_chan_scale_setup(struct ad7606_state *st, > return 0; > } > > -static int ad7606c_16bit_chan_scale_setup(struct ad7606_state *st, > +static int ad7606c_16bit_chan_scale_setup(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch) > { > + struct ad7606_state *st = iio_priv(indio_dev); > struct ad7606_chan_scale *cs = &st->chan_scales[ch]; > bool bipolar, differential; > int ret; > @@ -469,7 +474,7 @@ static int ad7606c_16bit_chan_scale_setup(struct ad7606_state *st, > return 0; > } > > - ret = ad7606_get_chan_config(st, ch, &bipolar, &differential); > + ret = ad7606_get_chan_config(indio_dev, ch, &bipolar, &differential); > if (ret) > return ret; > > @@ -512,9 +517,10 @@ static int ad7606c_16bit_chan_scale_setup(struct ad7606_state *st, > return 0; > } > > -static int ad7607_chan_scale_setup(struct ad7606_state *st, > +static int ad7607_chan_scale_setup(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch) > { > + struct ad7606_state *st = iio_priv(indio_dev); > struct ad7606_chan_scale *cs = &st->chan_scales[ch]; > > cs->range = 0; > @@ -523,9 +529,10 @@ static int ad7607_chan_scale_setup(struct ad7606_state *st, > return 0; > } > > -static int ad7608_chan_scale_setup(struct ad7606_state *st, > +static int ad7608_chan_scale_setup(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch) > { > + struct ad7606_state *st = iio_priv(indio_dev); > struct ad7606_chan_scale *cs = &st->chan_scales[ch]; > > cs->range = 0; > @@ -534,9 +541,10 @@ static int ad7608_chan_scale_setup(struct ad7606_state *st, > return 0; > } > > -static int ad7609_chan_scale_setup(struct ad7606_state *st, > +static int ad7609_chan_scale_setup(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch) > { > + struct ad7606_state *st = iio_priv(indio_dev); > struct ad7606_chan_scale *cs = &st->chan_scales[ch]; > > cs->range = 0; > @@ -1146,8 +1154,8 @@ static int ad7606_sw_mode_setup(struct iio_dev *indio_dev) > > static int ad7606_chan_scales_setup(struct iio_dev *indio_dev) > { > - unsigned int num_channels = indio_dev->num_channels - 1; > struct ad7606_state *st = iio_priv(indio_dev); > + unsigned int offset = indio_dev->num_channels - st->chip_info->num_adc_channels; > struct iio_chan_spec *chans; > size_t size; > int ch, ret; > @@ -1161,8 +1169,8 @@ static int ad7606_chan_scales_setup(struct iio_dev *indio_dev) > memcpy(chans, indio_dev->channels, size); > indio_dev->channels = chans; > > - for (ch = 0; ch < num_channels; ch++) { > - ret = st->chip_info->scale_setup_cb(st, &chans[ch + 1], ch); > + for (ch = 0; ch < st->chip_info->num_adc_channels; ch++) { > + ret = st->chip_info->scale_setup_cb(indio_dev, &chans[ch + offset], ch); > if (ret) > return ret; > } > diff --git a/drivers/iio/adc/ad7606.h b/drivers/iio/adc/ad7606.h > index 998814a92b82..8778ffe515b3 100644 > --- a/drivers/iio/adc/ad7606.h > +++ b/drivers/iio/adc/ad7606.h > @@ -69,7 +69,7 @@ > > struct ad7606_state; > > -typedef int (*ad7606_scale_setup_cb_t)(struct ad7606_state *st, > +typedef int (*ad7606_scale_setup_cb_t)(struct iio_dev *indio_dev, > struct iio_chan_spec *chan, int ch); > > /** >
diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index e35d55d03d86..d8e3c7a43678 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -175,17 +175,17 @@ static const struct iio_chan_spec ad7616_channels[] = { AD7606_CHANNEL(15, 16), }; -static int ad7606c_18bit_chan_scale_setup(struct ad7606_state *st, +static int ad7606c_18bit_chan_scale_setup(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch); -static int ad7606c_16bit_chan_scale_setup(struct ad7606_state *st, +static int ad7606c_16bit_chan_scale_setup(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch); -static int ad7606_16bit_chan_scale_setup(struct ad7606_state *st, +static int ad7606_16bit_chan_scale_setup(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch); -static int ad7607_chan_scale_setup(struct ad7606_state *st, +static int ad7607_chan_scale_setup(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch); -static int ad7608_chan_scale_setup(struct ad7606_state *st, +static int ad7608_chan_scale_setup(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch); -static int ad7609_chan_scale_setup(struct ad7606_state *st, +static int ad7609_chan_scale_setup(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch); const struct ad7606_chip_info ad7605_4_info = { @@ -323,9 +323,10 @@ int ad7606_reset(struct ad7606_state *st) } EXPORT_SYMBOL_NS_GPL(ad7606_reset, "IIO_AD7606"); -static int ad7606_16bit_chan_scale_setup(struct ad7606_state *st, +static int ad7606_16bit_chan_scale_setup(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch) { + struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_chan_scale *cs = &st->chan_scales[ch]; if (!st->sw_mode_en) { @@ -345,10 +346,12 @@ static int ad7606_16bit_chan_scale_setup(struct ad7606_state *st, return 0; } -static int ad7606_get_chan_config(struct ad7606_state *st, int ch, +static int ad7606_get_chan_config(struct iio_dev *indio_dev, int ch, bool *bipolar, bool *differential) { - unsigned int num_channels = st->chip_info->num_channels - 1; + struct ad7606_state *st = iio_priv(indio_dev); + unsigned int num_channels = st->chip_info->num_adc_channels; + unsigned int offset = indio_dev->num_channels - st->chip_info->num_adc_channels; struct device *dev = st->dev; int ret; @@ -364,7 +367,7 @@ static int ad7606_get_chan_config(struct ad7606_state *st, int ch, continue; /* channel number (here) is from 1 to num_channels */ - if (reg == 0 || reg > num_channels) { + if (reg < offset || reg > num_channels) { dev_warn(dev, "Invalid channel number (ignoring): %d\n", reg); continue; @@ -399,9 +402,10 @@ static int ad7606_get_chan_config(struct ad7606_state *st, int ch, return 0; } -static int ad7606c_18bit_chan_scale_setup(struct ad7606_state *st, +static int ad7606c_18bit_chan_scale_setup(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch) { + struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_chan_scale *cs = &st->chan_scales[ch]; bool bipolar, differential; int ret; @@ -413,7 +417,7 @@ static int ad7606c_18bit_chan_scale_setup(struct ad7606_state *st, return 0; } - ret = ad7606_get_chan_config(st, ch, &bipolar, &differential); + ret = ad7606_get_chan_config(indio_dev, ch, &bipolar, &differential); if (ret) return ret; @@ -455,9 +459,10 @@ static int ad7606c_18bit_chan_scale_setup(struct ad7606_state *st, return 0; } -static int ad7606c_16bit_chan_scale_setup(struct ad7606_state *st, +static int ad7606c_16bit_chan_scale_setup(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch) { + struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_chan_scale *cs = &st->chan_scales[ch]; bool bipolar, differential; int ret; @@ -469,7 +474,7 @@ static int ad7606c_16bit_chan_scale_setup(struct ad7606_state *st, return 0; } - ret = ad7606_get_chan_config(st, ch, &bipolar, &differential); + ret = ad7606_get_chan_config(indio_dev, ch, &bipolar, &differential); if (ret) return ret; @@ -512,9 +517,10 @@ static int ad7606c_16bit_chan_scale_setup(struct ad7606_state *st, return 0; } -static int ad7607_chan_scale_setup(struct ad7606_state *st, +static int ad7607_chan_scale_setup(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch) { + struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_chan_scale *cs = &st->chan_scales[ch]; cs->range = 0; @@ -523,9 +529,10 @@ static int ad7607_chan_scale_setup(struct ad7606_state *st, return 0; } -static int ad7608_chan_scale_setup(struct ad7606_state *st, +static int ad7608_chan_scale_setup(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch) { + struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_chan_scale *cs = &st->chan_scales[ch]; cs->range = 0; @@ -534,9 +541,10 @@ static int ad7608_chan_scale_setup(struct ad7606_state *st, return 0; } -static int ad7609_chan_scale_setup(struct ad7606_state *st, +static int ad7609_chan_scale_setup(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch) { + struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_chan_scale *cs = &st->chan_scales[ch]; cs->range = 0; @@ -1146,8 +1154,8 @@ static int ad7606_sw_mode_setup(struct iio_dev *indio_dev) static int ad7606_chan_scales_setup(struct iio_dev *indio_dev) { - unsigned int num_channels = indio_dev->num_channels - 1; struct ad7606_state *st = iio_priv(indio_dev); + unsigned int offset = indio_dev->num_channels - st->chip_info->num_adc_channels; struct iio_chan_spec *chans; size_t size; int ch, ret; @@ -1161,8 +1169,8 @@ static int ad7606_chan_scales_setup(struct iio_dev *indio_dev) memcpy(chans, indio_dev->channels, size); indio_dev->channels = chans; - for (ch = 0; ch < num_channels; ch++) { - ret = st->chip_info->scale_setup_cb(st, &chans[ch + 1], ch); + for (ch = 0; ch < st->chip_info->num_adc_channels; ch++) { + ret = st->chip_info->scale_setup_cb(indio_dev, &chans[ch + offset], ch); if (ret) return ret; } diff --git a/drivers/iio/adc/ad7606.h b/drivers/iio/adc/ad7606.h index 998814a92b82..8778ffe515b3 100644 --- a/drivers/iio/adc/ad7606.h +++ b/drivers/iio/adc/ad7606.h @@ -69,7 +69,7 @@ struct ad7606_state; -typedef int (*ad7606_scale_setup_cb_t)(struct ad7606_state *st, +typedef int (*ad7606_scale_setup_cb_t)(struct iio_dev *indio_dev, struct iio_chan_spec *chan, int ch); /**
When introducing num_adc_channels, I overlooked some new functions created in a meanwhile that had also the hardcoded offset. This commit adds the new logic to these functions. Fixes: 7a671afeb592 ("iio: adc: ad7606: Introduce num_adc_channels") Signed-off-by: Guillaume Stols <gstols@baylibre.com> --- drivers/iio/adc/ad7606.c | 48 ++++++++++++++++++++++++++++-------------------- drivers/iio/adc/ad7606.h | 2 +- 2 files changed, 29 insertions(+), 21 deletions(-)