openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio: imu: st_lsm6dsx: fix decimation factor estimation 

Fix decimation factor and sip estimation for LSM6DSM series
(max value for decimation factor is 32).
If gyro and accel sensors are enabled at 12.5Hz and 416Hz
respectively, decimation factor lookup will fail, producing
unaligned data.
Remove unused decimator filed in st_lsm6dsx_sensor structure.

Fixes: f8710f0357 ("iio: imu: st_lsm6dsx: express odr in mHZ")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Lorenzo Bianconi 2019-11-28 17:55:18 +02:00 committed by Jonathan Cameron
parent 53eaa9c27f
commit 5685b145c1
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
View File

@ -320,7 +320,6 @@ enum st_lsm6dsx_fifo_mode {
* @odr: Output data rate of the sensor [Hz]. * @odr: Output data rate of the sensor [Hz].
* @watermark: Sensor watermark level. * @watermark: Sensor watermark level.
* @sip: Number of samples in a given pattern. * @sip: Number of samples in a given pattern.
* @decimator: FIFO decimation factor.
* @ts_ref: Sensor timestamp reference for hw one. * @ts_ref: Sensor timestamp reference for hw one.
* @ext_info: Sensor settings if it is connected to i2c controller * @ext_info: Sensor settings if it is connected to i2c controller
*/ */
@ -334,7 +333,6 @@ struct st_lsm6dsx_sensor {
u16 watermark; u16 watermark;
u8 sip; u8 sip;
u8 decimator;
s64 ts_ref; s64 ts_ref;
struct { struct {

25
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
View File

@ -78,14 +78,20 @@ struct st_lsm6dsx_decimator_entry st_lsm6dsx_decimator_table[] = {
{ 32, 0x7 }, { 32, 0x7 },
}; };
static int st_lsm6dsx_get_decimator_val(u8 val) static int
st_lsm6dsx_get_decimator_val(struct st_lsm6dsx_sensor *sensor, u32 max_odr)
{ {
const int max_size = ARRAY_SIZE(st_lsm6dsx_decimator_table); const int max_size = ARRAY_SIZE(st_lsm6dsx_decimator_table);
u32 decimator = max_odr / sensor->odr;
int i; int i;
for (i = 0; i < max_size; i++) if (decimator > 1)
if (st_lsm6dsx_decimator_table[i].decimator == val) decimator = round_down(decimator, 2);
for (i = 0; i < max_size; i++) {
if (st_lsm6dsx_decimator_table[i].decimator == decimator)
break; break;
}
return i == max_size ? 0 : st_lsm6dsx_decimator_table[i].val; return i == max_size ? 0 : st_lsm6dsx_decimator_table[i].val;
} }
@ -111,6 +117,13 @@ static void st_lsm6dsx_get_max_min_odr(struct st_lsm6dsx_hw *hw,
} }
} }
static u8 st_lsm6dsx_get_sip(struct st_lsm6dsx_sensor *sensor, u32 min_odr)
{
u8 sip = sensor->odr / min_odr;
return sip > 1 ? round_down(sip, 2) : sip;
}
static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw) static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw)
{ {
const struct st_lsm6dsx_reg *ts_dec_reg; const struct st_lsm6dsx_reg *ts_dec_reg;
@ -131,12 +144,10 @@ static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw)
sensor = iio_priv(hw->iio_devs[i]); sensor = iio_priv(hw->iio_devs[i]);
/* update fifo decimators and sample in pattern */ /* update fifo decimators and sample in pattern */
if (hw->enable_mask & BIT(sensor->id)) { if (hw->enable_mask & BIT(sensor->id)) {
sensor->sip = sensor->odr / min_odr; sensor->sip = st_lsm6dsx_get_sip(sensor, min_odr);
sensor->decimator = max_odr / sensor->odr; data = st_lsm6dsx_get_decimator_val(sensor, max_odr);
data = st_lsm6dsx_get_decimator_val(sensor->decimator);
} else { } else {
sensor->sip = 0; sensor->sip = 0;
sensor->decimator = 0;
data = 0; data = 0;
} }
ts_sip = max_t(u16, ts_sip, sensor->sip); ts_sip = max_t(u16, ts_sip, sensor->sip);