lkml.org 
[lkml]   [2016]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.8 36/92] iio: st_sensors: fix scale configuration for h3lis331dl
    Date
    4.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>

    commit d304286abbbe7ed6228a553a56ba054e900907eb upstream.

    fix scale configuration/parsing for h3lis331dl accel driver
    when sensitivity is higher than 1(m/s^2)/digit

    Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@st.com>
    Fixes: 1e52fefc9b0c ("iio: accel: Add support for the h3lis331dl accelerometer")
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/iio/accel/st_accel_core.c | 12 ++++++++----
    drivers/iio/common/st_sensors/st_sensors_core.c | 8 +++++---
    2 files changed, 13 insertions(+), 7 deletions(-)

    --- a/drivers/iio/accel/st_accel_core.c
    +++ b/drivers/iio/accel/st_accel_core.c
    @@ -743,8 +743,8 @@ static int st_accel_read_raw(struct iio_

    return IIO_VAL_INT;
    case IIO_CHAN_INFO_SCALE:
    - *val = 0;
    - *val2 = adata->current_fullscale->gain;
    + *val = adata->current_fullscale->gain / 1000000;
    + *val2 = adata->current_fullscale->gain % 1000000;
    return IIO_VAL_INT_PLUS_MICRO;
    case IIO_CHAN_INFO_SAMP_FREQ:
    *val = adata->odr;
    @@ -763,9 +763,13 @@ static int st_accel_write_raw(struct iio
    int err;

    switch (mask) {
    - case IIO_CHAN_INFO_SCALE:
    - err = st_sensors_set_fullscale_by_gain(indio_dev, val2);
    + case IIO_CHAN_INFO_SCALE: {
    + int gain;
    +
    + gain = val * 1000000 + val2;
    + err = st_sensors_set_fullscale_by_gain(indio_dev, gain);
    break;
    + }
    case IIO_CHAN_INFO_SAMP_FREQ:
    if (val2)
    return -EINVAL;
    --- a/drivers/iio/common/st_sensors/st_sensors_core.c
    +++ b/drivers/iio/common/st_sensors/st_sensors_core.c
    @@ -619,7 +619,7 @@ EXPORT_SYMBOL(st_sensors_sysfs_sampling_
    ssize_t st_sensors_sysfs_scale_avail(struct device *dev,
    struct device_attribute *attr, char *buf)
    {
    - int i, len = 0;
    + int i, len = 0, q, r;
    struct iio_dev *indio_dev = dev_get_drvdata(dev);
    struct st_sensor_data *sdata = iio_priv(indio_dev);

    @@ -628,8 +628,10 @@ ssize_t st_sensors_sysfs_scale_avail(str
    if (sdata->sensor_settings->fs.fs_avl[i].num == 0)
    break;

    - len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
    - sdata->sensor_settings->fs.fs_avl[i].gain);
    + q = sdata->sensor_settings->fs.fs_avl[i].gain / 1000000;
    + r = sdata->sensor_settings->fs.fs_avl[i].gain % 1000000;
    +
    + len += scnprintf(buf + len, PAGE_SIZE - len, "%u.%06u ", q, r);
    }
    mutex_unlock(&indio_dev->mlock);
    buf[len - 1] = '\n';

    \
     
     \ /
      Last update: 2016-11-17 11:57    [W:4.367 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site