diff options
| author | Michael Hennerich <michael.hennerich@analog.com> | 2011-09-02 16:25:28 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 23:03:30 (GMT) |
| commit | 9b7244192fb310b3ca8352250e2fd0946ebebc54 (patch) | |
| tree | d62c3e6500a36fd5a679cd21eb9088c35986f9ca /drivers | |
| parent | 2b8cb40c9c788929bacbd0c2fdac847e66906805 (diff) | |
| download | linux-9b7244192fb310b3ca8352250e2fd0946ebebc54.tar.xz | |
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: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/iio/adc/ad7152.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/drivers/staging/iio/adc/ad7152.c b/drivers/staging/iio/adc/ad7152.c index 6b9d7ea..92a9c90 100644 --- a/drivers/staging/iio/adc/ad7152.c +++ b/drivers/staging/iio/adc/ad7152.c @@ -191,12 +191,16 @@ static IIO_DEV_ATTR_FILTER_RATE_SETUP(S_IRUGO | S_IWUSR, ad7152_show_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[] = { &iio_dev_attr_filter_rate_setup.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_capacitance0_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, }; @@ -211,9 +215,9 @@ static const u8 ad7152_addresses[][4] = { 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[] = { - 488, 244, 122, 61 + 30525, 7631, 15263, 61050 }; 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) return -EINVAL; for (i = 0; i < ARRAY_SIZE(ad7152_scale_table); i++) - if (val2 <= ad7152_scale_table[i]) + if (val2 == ad7152_scale_table[i]) break; chip->setup[chan->channel] &= ~AD7152_SETUP_RANGE_4pF; @@ -346,15 +350,29 @@ static int ad7152_read_raw(struct iio_dev *dev_info, *val = 0; *val2 = ad7152_scale_table[ret >> 6]; - return IIO_VAL_INT_PLUS_MICRO; + return IIO_VAL_INT_PLUS_NANO; default: 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 = { .attrs = &ad7152_attribute_group, .read_raw = &ad7152_read_raw, .write_raw = &ad7152_write_raw, + .write_raw_get_fmt = &ad7152_write_raw_get_fmt, .driver_module = THIS_MODULE, }; |