On 22/05/16 04:01, Matt Ranostay wrote:
> IIO_CHAN_INFO_RAW was returning processed data which was incorrect.
> This also adds the IIO_CHAN_INFO_SCALE value to convert to a processed value.
>
> Signed-off-by: Matt Ranostay <mranostay@xxxxxxxxx>
Applied to the fixes-togreg-post-rc1 branch of iio.git and marked for stable.
Thanks,
Jonathan
> ---
> Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935 | 2 +-
> drivers/iio/proximity/as3935.c | 10 ++++++++--
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935 b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
> index 6708c5e..33e96f7 100644
> --- a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
> +++ b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
> @@ -1,4 +1,4 @@
> -What /sys/bus/iio/devices/iio:deviceX/in_proximity_raw
> +What /sys/bus/iio/devices/iio:deviceX/in_proximity_input
> Date: March 2014
> KernelVersion: 3.15
> Contact: Matt Ranostay <mranostay@xxxxxxxxx>
> diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
> index f4d29d5..f0a0def 100644
> --- a/drivers/iio/proximity/as3935.c
> +++ b/drivers/iio/proximity/as3935.c
> @@ -72,7 +72,8 @@ static const struct iio_chan_spec as3935_channels[] = {
> .type = IIO_PROXIMITY,
> .info_mask_separate =
> BIT(IIO_CHAN_INFO_RAW) |
> - BIT(IIO_CHAN_INFO_PROCESSED),
> + BIT(IIO_CHAN_INFO_PROCESSED) |
> + BIT(IIO_CHAN_INFO_SCALE),
> .scan_index = 0,
> .scan_type = {
> .sign = 'u',
> @@ -181,7 +182,12 @@ static int as3935_read_raw(struct iio_dev *indio_dev,
> /* storm out of range */
> if (*val == AS3935_DATA_MASK)
> return -EINVAL;
> - *val *= 1000;
> +
> + if (m == IIO_CHAN_INFO_PROCESSED)
> + *val *= 1000;
> + break;
> + case IIO_CHAN_INFO_SCALE:
> + *val = 1000;
> break;
> default:
> return -EINVAL;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
