| Message ID | 20181206135315.22805-1-mircea.caprioru@analog.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio: dac: ad5686: fix bit shift read register | expand |
On Thu, 6 Dec 2018 15:53:15 +0200 Mircea Caprioru <mircea.caprioru@analog.com> wrote: > This patch solves the register readback issue with the bit shift. When the > dac resolution was lower than the register size (ex. 12 bits out of 16 > bits) the readback value was not shifted with the difference in bits and > the value was higher. Also a mask is applied on the read value in order to > get the value relative to the actual bit size. > > Fixes: 0357e488b8 ("iio:dac:ad5686: Refactor the driver") > Signed-off-by: Mircea Caprioru <mircea.caprioru@analog.com> This seems obvious, but a little strange we've not noticed it before. Ah well. Given the time in the cycle I'm going to take it for the next merge window rather than rushing it it. Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/iio/dac/ad5686.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c > index 54ff76b93366..a332b93ca2c4 100644 > --- a/drivers/iio/dac/ad5686.c > +++ b/drivers/iio/dac/ad5686.c > @@ -128,7 +128,8 @@ static int ad5686_read_raw(struct iio_dev *indio_dev, > mutex_unlock(&indio_dev->mlock); > if (ret < 0) > return ret; > - *val = ret; > + *val = (ret >> chan->scan_type.shift) & > + GENMASK(chan->scan_type.realbits - 1, 0); > return IIO_VAL_INT; > case IIO_CHAN_INFO_SCALE: > *val = st->vref_mv;
diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c index 54ff76b93366..a332b93ca2c4 100644 --- a/drivers/iio/dac/ad5686.c +++ b/drivers/iio/dac/ad5686.c @@ -128,7 +128,8 @@ static int ad5686_read_raw(struct iio_dev *indio_dev, mutex_unlock(&indio_dev->mlock); if (ret < 0) return ret; - *val = ret; + *val = (ret >> chan->scan_type.shift) & + GENMASK(chan->scan_type.realbits - 1, 0); return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: *val = st->vref_mv;
This patch solves the register readback issue with the bit shift. When the dac resolution was lower than the register size (ex. 12 bits out of 16 bits) the readback value was not shifted with the difference in bits and the value was higher. Also a mask is applied on the read value in order to get the value relative to the actual bit size. Fixes: 0357e488b8 ("iio:dac:ad5686: Refactor the driver") Signed-off-by: Mircea Caprioru <mircea.caprioru@analog.com> --- drivers/iio/dac/ad5686.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)