On Sun, 27 Oct 2019 19:02:30 +0100
Lorenzo Bianconi <lorenzo@xxxxxxxxxx> wrote:
> Since st_lsm6dsx i2c master controller relies on accel device as trigger
> and slave devices can run at different ODRs we must select an accel_odr >=
> slave_odr. Report real accel ODR in st_lsm6dsx_check_odr() in order to
> properly set sensor frequency in st_lsm6dsx_write_raw and avoid to
> report unsupported frequency
>
> Fixes: 6ffb55e5009ff ("iio: imu: st_lsm6dsx: introduce ST_LSM6DSX_ID_EXT sensor ids")
> Signed-off-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Given time in cycle I 'might' shift this into togreg to go in during the
merge window.
Thanks,
Jonathan
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index 1f28a7733fc0..c53c03ec2423 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -1362,8 +1362,7 @@ int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr, u8 *val)
> return -EINVAL;
>
> *val = odr_table->odr_avl[i].val;
> -
> - return 0;
> + return odr_table->odr_avl[i].hz;
> }
>
> static u16 st_lsm6dsx_check_odr_dependency(struct st_lsm6dsx_hw *hw, u16 odr,
> @@ -1527,8 +1526,10 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio_dev,
> case IIO_CHAN_INFO_SAMP_FREQ: {
> u8 data;
>
> - err = st_lsm6dsx_check_odr(sensor, val, &data);
> - if (!err)
> + val = st_lsm6dsx_check_odr(sensor, val, &data);
> + if (val < 0)
> + err = val;
> + else
> sensor->odr = val;
> break;
> }
