Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 20:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

iio: adc: ina2xx: Use LSB specifier instead of divider in config

Browse Source 
While the config uses the physical value corresponding to the LSB
for both the power and the bus voltage register, the shunt voltage is
specified as parts of 1 mV. Use the LSB physical value for all registers.

No functional change.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Stefan Brüns 2017-10-28 23:12:47 +02:00 committed by Jonathan Cameron
parent 2e64438487
commit 2d8119d752
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/iio/adc/ina2xx-adc.c
View File

@ -115,7 +115,7 @@ enum ina2xx_ids { ina219, ina226 };
struct ina2xx_config { struct ina2xx_config {
u16 config_default; u16 config_default;
int calibration_factor; int calibration_factor;
int shunt_div; int shunt_voltage_lsb; /* nV */
int bus_voltage_shift; /* position of lsb */ int bus_voltage_shift; /* position of lsb */
int bus_voltage_lsb; /* uV */ int bus_voltage_lsb; /* uV */
int power_lsb; /* uW */ int power_lsb; /* uW */
@ -138,7 +138,7 @@ static const struct ina2xx_config ina2xx_config[] = {
[ina219] = { [ina219] = {
.config_default = INA219_CONFIG_DEFAULT, .config_default = INA219_CONFIG_DEFAULT,
.calibration_factor = 40960000, .calibration_factor = 40960000,
.shunt_div = 100, .shunt_voltage_lsb = 10000,
.bus_voltage_shift = INA219_BUS_VOLTAGE_SHIFT, .bus_voltage_shift = INA219_BUS_VOLTAGE_SHIFT,
.bus_voltage_lsb = 4000, .bus_voltage_lsb = 4000,
.power_lsb = 20000, .power_lsb = 20000,
@ -147,7 +147,7 @@ static const struct ina2xx_config ina2xx_config[] = {
[ina226] = { [ina226] = {
.config_default = INA226_CONFIG_DEFAULT, .config_default = INA226_CONFIG_DEFAULT,
.calibration_factor = 5120000, .calibration_factor = 5120000,
.shunt_div = 400, .shunt_voltage_lsb = 2500,
.bus_voltage_shift = 0, .bus_voltage_shift = 0,
.bus_voltage_lsb = 1250, .bus_voltage_lsb = 1250,
.power_lsb = 25000, .power_lsb = 25000,
@ -204,9 +204,9 @@ static int ina2xx_read_raw(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_SCALE: case IIO_CHAN_INFO_SCALE:
switch (chan->address) { switch (chan->address) {
case INA2XX_SHUNT_VOLTAGE: case INA2XX_SHUNT_VOLTAGE:
/* processed (mV) = raw/shunt_div */ /* processed (mV) = raw * lsb(nV) / 1000000 */
*val2 = chip->config->shunt_div; *val = chip->config->shunt_voltage_lsb;
*val = 1; *val2 = 1000000;
return IIO_VAL_FRACTIONAL; return IIO_VAL_FRACTIONAL;
case INA2XX_BUS_VOLTAGE: case INA2XX_BUS_VOLTAGE: