| Message ID | 20181212005503.28054-8-jeremyfertic@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: iio: adt7316: dac fixes | expand |
On Tue, 11 Dec 2018 17:54:59 -0700 Jeremy Fertic <jeremyfertic@gmail.com> wrote: > The dac internal vref settings are part of the ldac config register rather > than the dac config register. Change the variable being used so the read > returns the correct result. > > Signed-off-by: Jeremy Fertic <jeremyfertic@gmail.com> Is this a follow through from the earlier 'correcting' the register addresses? Looks like it to me, so should really have been in that same patch. Oh well, it's staging and horribly broken so let's ignore that ;) It's separated enough from the earlier patches that I will apply it now though. Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Again I have added a do not backport note as far too much chance of it going wrong. Jonathan > --- > drivers/staging/iio/addac/adt7316.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c > index 77ef3c209b67..98101a7157d2 100644 > --- a/drivers/staging/iio/addac/adt7316.c > +++ b/drivers/staging/iio/addac/adt7316.c > @@ -1056,10 +1056,10 @@ static ssize_t adt7316_show_DAC_internal_Vref(struct device *dev, > > if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX) > return sprintf(buf, "0x%x\n", > - (chip->dac_config & ADT7516_DAC_IN_VREF_MASK) >> > + (chip->ldac_config & ADT7516_DAC_IN_VREF_MASK) >> > ADT7516_DAC_IN_VREF_OFFSET); > return sprintf(buf, "%d\n", > - !!(chip->dac_config & ADT7316_DAC_IN_VREF)); > + !!(chip->ldac_config & ADT7316_DAC_IN_VREF)); > } > > static ssize_t adt7316_store_DAC_internal_Vref(struct device *dev,
diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c index 77ef3c209b67..98101a7157d2 100644 --- a/drivers/staging/iio/addac/adt7316.c +++ b/drivers/staging/iio/addac/adt7316.c @@ -1056,10 +1056,10 @@ static ssize_t adt7316_show_DAC_internal_Vref(struct device *dev, if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX) return sprintf(buf, "0x%x\n", - (chip->dac_config & ADT7516_DAC_IN_VREF_MASK) >> + (chip->ldac_config & ADT7516_DAC_IN_VREF_MASK) >> ADT7516_DAC_IN_VREF_OFFSET); return sprintf(buf, "%d\n", - !!(chip->dac_config & ADT7316_DAC_IN_VREF)); + !!(chip->ldac_config & ADT7316_DAC_IN_VREF)); } static ssize_t adt7316_store_DAC_internal_Vref(struct device *dev,
The dac internal vref settings are part of the ldac config register rather than the dac config register. Change the variable being used so the read returns the correct result. Signed-off-by: Jeremy Fertic <jeremyfertic@gmail.com> --- drivers/staging/iio/addac/adt7316.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)