lkml.org 
[lkml]   [2016]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/7] iio: inv_mpu6050: Only toggle DATA_RDY_EN in inv_reset_fifo
    Date
    Signed-off-by: Crestez Dan Leonard <leonard.crestez@intel.com>
    ---
    drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 13 ++++++++-----
    drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 3 ++-
    2 files changed, 10 insertions(+), 6 deletions(-)

    diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
    index 8455af0..3fc0b71 100644
    --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
    +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
    @@ -41,7 +41,8 @@ int inv_reset_fifo(struct iio_dev *indio_dev)
    struct inv_mpu6050_state *st = iio_priv(indio_dev);

    /* disable interrupt */
    - result = regmap_write(st->map, st->reg->int_enable, 0);
    + result = regmap_update_bits(st->map, st->reg->int_enable,
    + INV_MPU6050_BIT_DATA_RDY_EN, 0);
    if (result) {
    dev_err(regmap_get_device(st->map), "int_enable failed %d\n",
    result);
    @@ -68,8 +69,9 @@ int inv_reset_fifo(struct iio_dev *indio_dev)
    /* enable interrupt */
    if (st->chip_config.accl_fifo_enable ||
    st->chip_config.gyro_fifo_enable) {
    - result = regmap_write(st->map, st->reg->int_enable,
    - INV_MPU6050_BIT_DATA_RDY_EN);
    + result = regmap_update_bits(st->map, st->reg->int_enable,
    + INV_MPU6050_BIT_DATA_RDY_EN,
    + INV_MPU6050_BIT_DATA_RDY_EN);
    if (result)
    return result;
    }
    @@ -92,8 +94,9 @@ int inv_reset_fifo(struct iio_dev *indio_dev)

    reset_fifo_fail:
    dev_err(regmap_get_device(st->map), "reset fifo failed %d\n", result);
    - result = regmap_write(st->map, st->reg->int_enable,
    - INV_MPU6050_BIT_DATA_RDY_EN);
    + result = regmap_update_bits(st->map, st->reg->int_enable,
    + INV_MPU6050_BIT_DATA_RDY_EN,
    + INV_MPU6050_BIT_DATA_RDY_EN);

    return result;
    }
    diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
    index e8818d4..1a6bad3 100644
    --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
    +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
    @@ -69,7 +69,8 @@ static int inv_mpu6050_set_enable(struct iio_dev *indio_dev, bool enable)
    if (result)
    return result;

    - result = regmap_write(st->map, st->reg->int_enable, 0);
    + result = regmap_update_bits(st->map, st->reg->int_enable,
    + INV_MPU6050_BIT_DATA_RDY_EN, 0);
    if (result)
    return result;

    --
    2.5.5
    \
     
     \ /
      Last update: 2016-04-29 21:21    [W:2.247 / U:0.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site