Commit 9b724419 authored by Michael Hennerich's avatar Michael Hennerich Committed by Greg Kroah-Hartman

staging:iio:adc:ad7152: update scale handling

Add scale_available attribute.
fix ad7152_scale_table, values are not sorted descending.
Use IIO_VAL_INT_PLUS_NANO, to increase granularity.
Update scale handling accordingly.
Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2b8cb40c
...@@ -191,12 +191,16 @@ static IIO_DEV_ATTR_FILTER_RATE_SETUP(S_IRUGO | S_IWUSR, ...@@ -191,12 +191,16 @@ static IIO_DEV_ATTR_FILTER_RATE_SETUP(S_IRUGO | S_IWUSR,
ad7152_show_filter_rate_setup, ad7152_show_filter_rate_setup,
ad7152_store_filter_rate_setup); ad7152_store_filter_rate_setup);
static IIO_CONST_ATTR(in_capacitance_scale_available,
"0.000061050 0.000030525 0.000015263 0.000007631");
static struct attribute *ad7152_attributes[] = { static struct attribute *ad7152_attributes[] = {
&iio_dev_attr_filter_rate_setup.dev_attr.attr, &iio_dev_attr_filter_rate_setup.dev_attr.attr,
&iio_dev_attr_in_capacitance0_calibbias_calibration.dev_attr.attr, &iio_dev_attr_in_capacitance0_calibbias_calibration.dev_attr.attr,
&iio_dev_attr_in_capacitance1_calibbias_calibration.dev_attr.attr, &iio_dev_attr_in_capacitance1_calibbias_calibration.dev_attr.attr,
&iio_dev_attr_in_capacitance0_calibscale_calibration.dev_attr.attr, &iio_dev_attr_in_capacitance0_calibscale_calibration.dev_attr.attr,
&iio_dev_attr_in_capacitance1_calibscale_calibration.dev_attr.attr, &iio_dev_attr_in_capacitance1_calibscale_calibration.dev_attr.attr,
&iio_const_attr_in_capacitance_scale_available.dev_attr.attr,
NULL, NULL,
}; };
...@@ -211,9 +215,9 @@ static const u8 ad7152_addresses[][4] = { ...@@ -211,9 +215,9 @@ static const u8 ad7152_addresses[][4] = {
AD7152_REG_CH2_GAIN_HIGH, AD7152_REG_CH2_SETUP }, AD7152_REG_CH2_GAIN_HIGH, AD7152_REG_CH2_SETUP },
}; };
/* Values are micro relative to pf base. */ /* Values are nano relative to pf base. */
static const int ad7152_scale_table[] = { static const int ad7152_scale_table[] = {
488, 244, 122, 61 30525, 7631, 15263, 61050
}; };
static int ad7152_write_raw(struct iio_dev *dev_info, static int ad7152_write_raw(struct iio_dev *dev_info,
...@@ -254,7 +258,7 @@ static int ad7152_write_raw(struct iio_dev *dev_info, ...@@ -254,7 +258,7 @@ static int ad7152_write_raw(struct iio_dev *dev_info,
if (val != 0) if (val != 0)
return -EINVAL; return -EINVAL;
for (i = 0; i < ARRAY_SIZE(ad7152_scale_table); i++) for (i = 0; i < ARRAY_SIZE(ad7152_scale_table); i++)
if (val2 <= ad7152_scale_table[i]) if (val2 == ad7152_scale_table[i])
break; break;
chip->setup[chan->channel] &= ~AD7152_SETUP_RANGE_4pF; chip->setup[chan->channel] &= ~AD7152_SETUP_RANGE_4pF;
...@@ -346,15 +350,29 @@ static int ad7152_read_raw(struct iio_dev *dev_info, ...@@ -346,15 +350,29 @@ static int ad7152_read_raw(struct iio_dev *dev_info,
*val = 0; *val = 0;
*val2 = ad7152_scale_table[ret >> 6]; *val2 = ad7152_scale_table[ret >> 6];
return IIO_VAL_INT_PLUS_MICRO; return IIO_VAL_INT_PLUS_NANO;
default: default:
return -EINVAL; return -EINVAL;
}; };
} }
static int ad7152_write_raw_get_fmt(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
long mask)
{
switch (mask) {
case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
return IIO_VAL_INT_PLUS_NANO;
default:
return IIO_VAL_INT_PLUS_MICRO;
}
}
static const struct iio_info ad7152_info = { static const struct iio_info ad7152_info = {
.attrs = &ad7152_attribute_group, .attrs = &ad7152_attribute_group,
.read_raw = &ad7152_read_raw, .read_raw = &ad7152_read_raw,
.write_raw = &ad7152_write_raw, .write_raw = &ad7152_write_raw,
.write_raw_get_fmt = &ad7152_write_raw_get_fmt,
.driver_module = THIS_MODULE, .driver_module = THIS_MODULE,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment