Commit e2cc390a authored by David Lechner's avatar David Lechner Committed by Jonathan Cameron
Browse files

iio: adc: ad7124: fix temperature channel 



Fix temperature channel not working due to gain and offset not being
initialized.  For channels other than the voltage ones calibration is
skipped (which is OK).  However that results in the calibration register
values tracked in st->channels[i].cfg all being zero.  These zeros are
later written to hardware before a measurement is made which caused the
raw temperature readings to be always 8388608 (0x800000).

To fix it, we just make sure the gain and offset values are set to the
default values and still return early without doing an internal
calibration.

While here, add a comment explaining why we don't bother calibrating
the temperature channel.

Fixes: 47036a03 ("iio: adc: ad7124: Implement internal calibration at probe time")
Reviewed-by: default avatarMarcelo Schmitt <marcelo.schmitt@analog.com>
Signed-off-by: default avatarDavid Lechner <dlechner@baylibre.com>
Reviewed-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 21553258

drivers/iio/adc/ad7124.c

+8 −4
Original line number Diff line number Diff line
@@ -1525,10 +1525,6 @@ static int __ad7124_calibrate_all(struct ad7124_state *st, struct iio_dev *indio 
	int ret, i;



	for (i = 0; i < st->num_channels; i++) {



		if (indio_dev->channels[i].type != IIO_VOLTAGE)

			continue;



		/*

		 * For calibration the OFFSET register should hold its reset default

		 * value. For the GAIN register there is no such requirement but
@@ -1538,6 +1534,14 @@ static int __ad7124_calibrate_all(struct ad7124_state *st, struct iio_dev *indio 
		st->channels[i].cfg.calibration_offset = 0x800000;

		st->channels[i].cfg.calibration_gain = st->gain_default;



		/*

		 * Only the main voltage input channels are important enough

		 * to be automatically calibrated here. For everything else,

		 * just use the default values set above.

		 */

		if (indio_dev->channels[i].type != IIO_VOLTAGE)

			continue;



		/*

		 * Full-scale calibration isn't supported at gain 1, so skip in

		 * that case. Note that untypically full-scale calibration has