|
|
@@ -308,32 +308,40 @@ static int st_lsm6dsx_set_full_scale(struct st_lsm6dsx_sensor *sensor,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int st_lsm6dsx_set_odr(struct st_lsm6dsx_sensor *sensor, u16 odr)
|
|
|
+static int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr,
|
|
|
+ u8 *val)
|
|
|
{
|
|
|
- enum st_lsm6dsx_sensor_id id = sensor->id;
|
|
|
- int i, err;
|
|
|
- u8 val;
|
|
|
+ int i;
|
|
|
|
|
|
for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++)
|
|
|
- if (st_lsm6dsx_odr_table[id].odr_avl[i].hz == odr)
|
|
|
+ if (st_lsm6dsx_odr_table[sensor->id].odr_avl[i].hz == odr)
|
|
|
break;
|
|
|
|
|
|
if (i == ST_LSM6DSX_ODR_LIST_SIZE)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- val = st_lsm6dsx_odr_table[id].odr_avl[i].val;
|
|
|
- err = st_lsm6dsx_write_with_mask(sensor->hw,
|
|
|
- st_lsm6dsx_odr_table[id].reg.addr,
|
|
|
- st_lsm6dsx_odr_table[id].reg.mask,
|
|
|
- val);
|
|
|
- if (err < 0)
|
|
|
- return err;
|
|
|
-
|
|
|
+ *val = st_lsm6dsx_odr_table[sensor->id].odr_avl[i].val;
|
|
|
sensor->odr = odr;
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static int st_lsm6dsx_set_odr(struct st_lsm6dsx_sensor *sensor, u16 odr)
|
|
|
+{
|
|
|
+ enum st_lsm6dsx_sensor_id id = sensor->id;
|
|
|
+ int err;
|
|
|
+ u8 val;
|
|
|
+
|
|
|
+ err = st_lsm6dsx_check_odr(sensor, odr, &val);
|
|
|
+ if (err < 0)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ return st_lsm6dsx_write_with_mask(sensor->hw,
|
|
|
+ st_lsm6dsx_odr_table[id].reg.addr,
|
|
|
+ st_lsm6dsx_odr_table[id].reg.mask,
|
|
|
+ val);
|
|
|
+}
|
|
|
+
|
|
|
int st_lsm6dsx_sensor_enable(struct st_lsm6dsx_sensor *sensor)
|
|
|
{
|
|
|
int err;
|
|
|
@@ -436,9 +444,12 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio_dev,
|
|
|
case IIO_CHAN_INFO_SCALE:
|
|
|
err = st_lsm6dsx_set_full_scale(sensor, val2);
|
|
|
break;
|
|
|
- case IIO_CHAN_INFO_SAMP_FREQ:
|
|
|
- err = st_lsm6dsx_set_odr(sensor, val);
|
|
|
+ case IIO_CHAN_INFO_SAMP_FREQ: {
|
|
|
+ u8 data;
|
|
|
+
|
|
|
+ err = st_lsm6dsx_check_odr(sensor, val, &data);
|
|
|
break;
|
|
|
+ }
|
|
|
default:
|
|
|
err = -EINVAL;
|
|
|
break;
|