UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio: adc: ti-ads1015: remove unnecessary config register update 

The ti-ads1015 driver has eight iio voltage channels and each iio channel
can hold own scale information.

The ADS1015 device only have a single config register which contains an
input multiplexer selection, PGA and data rate settings.  So the driver
should load the correct settings when the input multiplexer selection is
changed.

However, regardless of which channlel is currently selected, changing any
iio channel's scale information immediately overwrites the current PGA
setting in the config register.

It is harmless because the correct PGA settings are reloaded just before
getting adc result anyway.  But it is unnecessary register update and
should be removed.

Cc: Daniel Baluta <daniel.baluta@gmail.com>
Cc: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Akinobu Mita 2017-07-21 00:24:23 +09:00 committed by Jonathan Cameron
parent 4744d4e2af
commit 56b57a9eb8
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/iio/adc/ti-ads1015.c
View File

@ -312,28 +312,18 @@ static int ads1015_set_scale(struct ads1015_data *data,
struct iio_chan_spec const *chan, struct iio_chan_spec const *chan,
int scale, int uscale) int scale, int uscale)
{ {
int i, ret, rindex = -1; int i;
int fullscale = div_s64((scale * 1000000LL + uscale) << int fullscale = div_s64((scale * 1000000LL + uscale) <<
(chan->scan_type.realbits - 1), 1000000); (chan->scan_type.realbits - 1), 1000000);
for (i = 0; i < ARRAY_SIZE(ads1015_fullscale_range); i++) { for (i = 0; i < ARRAY_SIZE(ads1015_fullscale_range); i++) {
if (ads1015_fullscale_range[i] == fullscale) { if (ads1015_fullscale_range[i] == fullscale) {
rindex = i; data->channel_data[chan->address].pga = i;
break; return 0;
} }
} }
if (rindex < 0)
return -EINVAL;
ret = regmap_update_bits(data->regmap, ADS1015_CFG_REG, return -EINVAL;
ADS1015_CFG_PGA_MASK,
rindex << ADS1015_CFG_PGA_SHIFT);
if (ret < 0)
return ret;
data->channel_data[chan->address].pga = rindex;
return 0;
} }
static int ads1015_set_data_rate(struct ads1015_data *data, int chan, int rate) static int ads1015_set_data_rate(struct ads1015_data *data, int chan, int rate)