support rational ODRs in st_lsm6dsx
Subsystems (2)
Lorenzo Bianconi
maintainercover support rational ODRs in st_lsm6dsx
Express ODRs in HZ / 10 in order to support rational ODRs (e.g. 12.5Hz). This series will fix an Android CTS failure.
Explicitly define odr table size.
This series is based on 'iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw'
https://patchwork.kernel.org/patch/11214281/
Lorenzo Bianconi (2):
iio: imu: st_lsm6dsx: explicitly define odr table size
iio: imu: st_lsm6dsx: express odr in HZ / 10
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 4 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 206 ++++++++++--------- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 33 +-- 3 files changed, 133 insertions(+), 110 deletions(-)
Signature · 1 line
2.21.0
Lorenzo Bianconi
maintainerPATCH 1/2 iio: imu: st_lsm6dsx: explicitly define odr table size
Introduce odr_len in st_lsm6dsx_odr_table_entry data structure in order to explicitly define odr table size and support devices with different odr table map
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 ++ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 27 +++++++++++++++----- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 12 ++++----- 3 files changed, 29 insertions(+), 12 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +2 -0
@@ -113,7 +113,9 @@ struct st_lsm6dsx_odr {#define ST_LSM6DSX_ODR_LIST_SIZE 6struct st_lsm6dsx_odr_table_entry {struct st_lsm6dsx_reg reg; +struct st_lsm6dsx_odr odr_avl[ST_LSM6DSX_ODR_LIST_SIZE ]; +int odr_len; };struct st_lsm6dsx_fs {
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +21 -6
@@ -133,6 +133,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 238, 0x04 }, .odr_avl[4] = { 476, 0x05 }, .odr_avl[5] = { 952, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = {
@@ -145,6 +146,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 238, 0x04 }, .odr_avl[4] = { 476, 0x05 }, .odr_avl[5] = { 952, 0x06 }, + .odr_len = 6, }, }, .fs_table = {
@@ -233,6 +235,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = {
@@ -245,6 +248,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, }, .fs_table = {
@@ -397,6 +401,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = {
@@ -409,6 +414,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, }, .fs_table = {
@@ -570,6 +576,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = {
@@ -582,6 +589,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, }, .fs_table = {
@@ -745,6 +753,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = {
@@ -757,6 +766,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, }, .fs_table = {
@@ -940,6 +950,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = {
@@ -952,6 +963,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, }, .fs_table = {
@@ -1115,6 +1127,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = {
@@ -1127,6 +1140,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, }, .fs_table = {
@@ -1350,15 +1364,16 @@ int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr, u8 *val)int i; odr_table = &sensor->hw->settings->odr_table[sensor->id]; -for (i =0 ; i <ST_LSM6DSX_ODR_LIST_SIZE ; i++) +for (i =0 ; i < odr_table->odr_len; i++) {/* * ext devices can run at different odr respect to * accel sensor */ if (odr_table->odr_avl[i].hz >= odr)break ; + } -if (i ==ST_LSM6DSX_ODR_LIST_SIZE ) +if (i == odr_table->odr_len)return -EINVAL ; *val = odr_table->odr_avl[i].val;
@@ -1710,13 +1725,13 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev, char *buf) {struct st_lsm6dsx_sensor *sensor =iio_priv (dev_get_drvdata (dev)); -enum st_lsm6dsx_sensor_id id = sensor->id; -struct st_lsm6dsx_hw *hw = sensor->hw; +const struct st_lsm6dsx_odr_table_entry *odr_table;int i, len =0 ; -for (i =0 ; i <ST_LSM6DSX_ODR_LIST_SIZE ; i++) + odr_table = &sensor->hw->settings->odr_table[sensor->id]; +for (i =0 ; i < odr_table->odr_len; i++) len +=scnprintf (buf + len,PAGE_SIZE - len,"%d " , - hw->settings->odr_table[id].odr_avl[i].hz); + odr_table->odr_avl[i].hz); buf[len -1 ] ='\n' ;return len;
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +6 -6
@@ -55,6 +55,7 @@ static const struct st_lsm6dsx_ext_dev_settings st_lsm6dsx_ext_dev_table[] = { .odr_avl[1] = { 20, 0x1 }, .odr_avl[2] = { 50, 0x2 }, .odr_avl[3] = { 100, 0x3 }, + .odr_len = 4, }, .fs_table = { .fs_avl[0] = {
@@ -323,11 +324,12 @@ st_lsm6dsx_shub_get_odr_val(struct st_lsm6dsx_sensor *sensor,int i; settings = sensor->ext_info.settings; -for (i =0 ; i <ST_LSM6DSX_ODR_LIST_SIZE ; i++) +for (i =0 ; i < settings->odr_table.odr_len; i++) {if (settings->odr_table.odr_avl[i].hz == odr)break ; + } -if (i ==ST_LSM6DSX_ODR_LIST_SIZE ) +if (i == settings->odr_table.odr_len)return -EINVAL ; *val = settings->odr_table.odr_avl[i].val;
@@ -537,12 +539,10 @@ st_lsm6dsx_shub_sampling_freq_avail(struct device *dev,int i, len =0 ; settings = sensor->ext_info.settings; -for (i =0 ; i <ST_LSM6DSX_ODR_LIST_SIZE ; i++) { +for (i =0 ; i < settings->odr_table.odr_len; i++) {u16 val = settings->odr_table.odr_avl[i].hz; -if (val >0 ) - len +=scnprintf (buf + len,PAGE_SIZE - len,"%d " , - val); + len +=scnprintf (buf + len,PAGE_SIZE - len,"%d " , val); } buf[len -1 ] ='\n' ;
Signature · 1 line
2.21.0
Lorenzo Bianconi
maintainerPATCH 2/2 iio: imu: st_lsm6dsx: express odr in HZ / 10
In reply to Lorenzo BianconiExpress available frequencies in HZ / 10 in order to support even rational ODRs. This patch is need to fix an Android CTS failure
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 181 ++++++++++--------- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 23 ++- 3 files changed, 106 insertions(+), 100 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +1 -1
@@ -106,7 +106,7 @@ struct st_lsm6dsx_sensor;struct st_lsm6dsx_hw ;struct st_lsm6dsx_odr { -u16 hz; +u16 hz;/* expressed in HZ / 10 */ u8 val; };
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +92 -89
289 lines not on this page · raw message
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +13 -10
@@ -51,10 +51,10 @@ static const struct st_lsm6dsx_ext_dev_settings st_lsm6dsx_ext_dev_table[] = { .addr = 0x60, .mask = GENMASK(3, 2), }, - .odr_avl[0] = { 10, 0x0 }, - .odr_avl[1] = { 20, 0x1 }, - .odr_avl[2] = { 50, 0x2 }, - .odr_avl[3] = { 100, 0x3 }, + .odr_avl[0] = { 100, 0x0 }, + .odr_avl[1] = { 200, 0x1 }, + .odr_avl[2] = { 500, 0x2 }, + .odr_avl[3] = { 1000, 0x3 }, .odr_len = 4, }, .fs_table = {
@@ -97,8 +97,8 @@ static void st_lsm6dsx_shub_wait_complete(struct st_lsm6dsx_hw *hw)u16 odr; sensor =iio_priv (hw->iio_devs[ST_LSM6DSX_ID_ACC ]); - odr = (hw->enable_mask &BIT (ST_LSM6DSX_ID_ACC )) ? sensor->odr :13 ; -msleep ((2000U / odr) +1 ); + odr = (hw->enable_mask &BIT (ST_LSM6DSX_ID_ACC )) ? sensor->odr :125 ; +msleep ((20000U / odr) +1 ); }/**
@@ -442,7 +442,7 @@ st_lsm6dsx_shub_read_oneshot(struct st_lsm6dsx_sensor *sensor,if (err <0 )return err; - delay =1000000 / sensor->odr; + delay =10000000 / sensor->odr;usleep_range (delay,2 * delay); len =min_t (int,sizeof (data), ch->scan_type.realbits >>3 );
@@ -482,8 +482,9 @@ st_lsm6dsx_shub_read_raw(struct iio_dev *iio_dev,iio_device_release_direct_mode (iio_dev);break ;case IIO_CHAN_INFO_SAMP_FREQ : - *val = sensor->odr; - ret =IIO_VAL_INT ; + *val = sensor->odr /10 ; + *val2 = (sensor->odr %10 ) *100000 ; + ret =IIO_VAL_INT_PLUS_MICRO ;break ;case IIO_CHAN_INFO_SCALE : *val =0 ;
@@ -514,6 +515,7 @@ st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev,case IIO_CHAN_INFO_SAMP_FREQ : {u16 data; + val = val *10 + val2 /100000 ; err =st_lsm6dsx_shub_get_odr_val (sensor, val, &data);if (!err) sensor->odr = val;
@@ -542,7 +544,8 @@ st_lsm6dsx_shub_sampling_freq_avail(struct device *dev,for (i =0 ; i < settings->odr_table.odr_len; i++) {u16 val = settings->odr_table.odr_avl[i].hz; - len +=scnprintf (buf + len,PAGE_SIZE - len,"%d " , val); + len +=scnprintf (buf + len,PAGE_SIZE - len,"%d.%d " , + val /10 , val %10 ); } buf[len -1 ] ='\n' ;
Signature · 1 line
2.21.0
Quoted 16 lines · Lorenzo Bianconi
Express ODRs in HZ / 10 in order to support rational ODRs (e.g. 12.5Hz). This series will fix an Android CTS failure.
Explicitly define odr table size.
This series is based on 'iio: imu:st_lsm6dsx: fix ODR check inst_lsm6dsx_write_raw'
https://patchwork.kernel.org/patch/11214281/Lorenzo Bianconi (2):
iio: imu:st_lsm6dsx: explicitly define odr table size
iio: imu:st_lsm6dsx: express odr in HZ / 10drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 4 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 206 ++++++++++--------- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 33 +-- 3 files changed, 133 insertions(+), 110 deletions(-)
Jonathan Cameron
maintainerRe: [PATCH 2/2] iio: imu: st_lsm6dsx: express odr in HZ / 10
In reply to Lorenzo BianconiQuoted 15 lines · On Sun, 27 Oct 2019 20:21:24 +0100 Lorenzo Bianconi <[email protected]> wrote:
Express available frequencies in HZ / 10 in order to support even rational ODRs. This patch is need to fix an Android CTS failure
Signed-off-by Lorenzo Bianconi <[email protected]>--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 181 ++++++++++--------- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 23 ++- 3 files changed, 106 insertions(+), 100 deletions(-)drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +0
-0
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h struct st_lsm6dsx_sensor; · line 109
Quoted 5 lines
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +1
-1@@ -106,7 +106,7 @@ struct st_lsm6dsx_sensor;struct st_lsm6dsx_hw ;struct st_lsm6dsx_odr { -u16 hz; +u16 hz;/* expressed in HZ / 10 */
That is in the non obvious category. Maybe best bet is to switch to millihz and make the type bigger if needed?
Thanks,
Jonathan
Quoted 383 lines
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +0
-0u8 val; };drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +92
-89@@ -127,12 +127,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x20, .mask = GENMASK(7, 5), }, - .odr_avl[0] = { 10, 0x01 }, - .odr_avl[1] = { 50, 0x02 }, - .odr_avl[2] = { 119, 0x03 }, - .odr_avl[3] = { 238, 0x04 }, - .odr_avl[4] = { 476, 0x05 }, - .odr_avl[5] = { 952, 0x06 }, + .odr_avl[0] = { 100, 0x01 }, + .odr_avl[1] = { 500, 0x02 }, + .odr_avl[2] = { 1190, 0x03 }, + .odr_avl[3] = { 2380, 0x04 }, + .odr_avl[4] = { 4760, 0x05 }, + .odr_avl[5] = { 9520, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -140,12 +140,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 5), }, - .odr_avl[0] = { 15, 0x01 }, - .odr_avl[1] = { 60, 0x02 }, - .odr_avl[2] = { 119, 0x03 }, - .odr_avl[3] = { 238, 0x04 }, - .odr_avl[4] = { 476, 0x05 }, - .odr_avl[5] = { 952, 0x06 }, + .odr_avl[0] = { 149, 0x01 }, + .odr_avl[1] = { 595, 0x02 }, + .odr_avl[2] = { 1190, 0x03 }, + .odr_avl[3] = { 2380, 0x04 }, + .odr_avl[4] = { 4760, 0x05 }, + .odr_avl[5] = { 9520, 0x06 }, .odr_len = 6, }, },@@ -229,12 +229,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -242,12 +242,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, },@@ -395,12 +395,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -408,12 +408,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, },@@ -570,12 +570,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -583,12 +583,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, },@@ -747,12 +747,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -760,12 +760,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, },@@ -944,12 +944,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -957,12 +957,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, },@@ -1121,12 +1121,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -1134,12 +1134,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, },@@ -1475,7 +1475,7 @@ static int st_lsm6dsx_read_oneshot(struct st_lsm6dsx_sensor *sensor,if (err <0 )return err; - delay =1000000 / sensor->odr; + delay =10000000 / sensor->odr;usleep_range (delay,2 * delay); err =st_lsm6dsx_read_locked (hw, addr, &data,sizeof (data));@@ -1507,8 +1507,9 @@ static int st_lsm6dsx_read_raw(struct iio_dev *iio_dev,iio_device_release_direct_mode (iio_dev);break ;case IIO_CHAN_INFO_SAMP_FREQ : - *val = sensor->odr; - ret =IIO_VAL_INT ; + *val = sensor->odr /10 ; + *val2 = (sensor->odr %10 ) *100000 ; + ret =IIO_VAL_INT_PLUS_MICRO ;break ;case IIO_CHAN_INFO_SCALE : *val =0 ;@@ -1541,6 +1542,7 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio_dev,case IIO_CHAN_INFO_SAMP_FREQ : {u8 data; + val = val *10 + val2 /100000 ; val =st_lsm6dsx_check_odr (sensor, val, &data);if (val <0 ) err = val;@@ -1730,8 +1732,9 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev, odr_table = &sensor->hw->settings->odr_table[sensor->id];for (i =0 ; i < odr_table->odr_len; i++) - len +=scnprintf (buf + len,PAGE_SIZE - len,"%d " , - odr_table->odr_avl[i].hz); + len +=scnprintf (buf + len,PAGE_SIZE - len,"%d.%d " , + odr_table->odr_avl[i].hz /10 , + odr_table->odr_avl[i].hz %10 ); buf[len -1 ] ='\n' ;return len;drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +13
-10@@ -51,10 +51,10 @@ static const struct st_lsm6dsx_ext_dev_settings st_lsm6dsx_ext_dev_table[] = { .addr = 0x60, .mask = GENMASK(3, 2), }, - .odr_avl[0] = { 10, 0x0 }, - .odr_avl[1] = { 20, 0x1 }, - .odr_avl[2] = { 50, 0x2 }, - .odr_avl[3] = { 100, 0x3 }, + .odr_avl[0] = { 100, 0x0 }, + .odr_avl[1] = { 200, 0x1 }, + .odr_avl[2] = { 500, 0x2 }, + .odr_avl[3] = { 1000, 0x3 }, .odr_len = 4, }, .fs_table = {@@ -97,8 +97,8 @@ static void st_lsm6dsx_shub_wait_complete(struct st_lsm6dsx_hw *hw)u16 odr; sensor =iio_priv (hw->iio_devs[ST_LSM6DSX_ID_ACC ]); - odr = (hw->enable_mask &BIT (ST_LSM6DSX_ID_ACC )) ? sensor->odr :13 ; -msleep ((2000U / odr) +1 ); + odr = (hw->enable_mask &BIT (ST_LSM6DSX_ID_ACC )) ? sensor->odr :125 ; +msleep ((20000U / odr) +1 ); }/** @@ -442,7 +442,7 @@ st_lsm6dsx_shub_read_oneshot(struct st_lsm6dsx_sensor *sensor,if (err <0 )return err; - delay =1000000 / sensor->odr; + delay =10000000 / sensor->odr;usleep_range (delay,2 * delay); len =min_t (int,sizeof (data), ch->scan_type.realbits >>3 );@@ -482,8 +482,9 @@ st_lsm6dsx_shub_read_raw(struct iio_dev *iio_dev,iio_device_release_direct_mode (iio_dev);break ;case IIO_CHAN_INFO_SAMP_FREQ : - *val = sensor->odr; - ret =IIO_VAL_INT ; + *val = sensor->odr /10 ; + *val2 = (sensor->odr %10 ) *100000 ; + ret =IIO_VAL_INT_PLUS_MICRO ;break ;case IIO_CHAN_INFO_SCALE : *val =0 ;@@ -514,6 +515,7 @@ st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev,case IIO_CHAN_INFO_SAMP_FREQ : {u16 data; + val = val *10 + val2 /100000 ; err =st_lsm6dsx_shub_get_odr_val (sensor, val, &data);if (!err) sensor->odr = val;@@ -542,7 +544,8 @@ st_lsm6dsx_shub_sampling_freq_avail(struct device *dev,for (i =0 ; i < settings->odr_table.odr_len; i++) {u16 val = settings->odr_table.odr_avl[i].hz; - len +=scnprintf (buf + len,PAGE_SIZE - len,"%d " , val); + len +=scnprintf (buf + len,PAGE_SIZE - len,"%d.%d " , + val /10 , val %10 ); } buf[len -1 ] ='\n' ;
Re: [PATCH 2/2] iio: imu: st_lsm6dsx: express odr in HZ / 10
Quoted 20 lines · Jonathan Cameron
Quoted 17 lines · On Sun, 27 Oct 2019 20:21:24 +0100 Lorenzo Bianconi <[email protected]> wrote:
Express available frequencies in HZ / 10 in order to support even rational ODRs. This patch is need to fix an Android CTS failure
Signed-off-by Lorenzo Bianconi <[email protected]>--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 181 ++++++++++--------- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 23 ++- 3 files changed, 106 insertions(+), 100 deletions(-)drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +0
-0@@ -106,7 +106,7 @@ struct st_lsm6dsx_sensor;struct st_lsm6dsx_hw ;
Quoted 6 lines
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h struct st_lsm6dsx_sensor; · line 109
Quoted 3 lines
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +1
-1struct st_lsm6dsx_odr { -u16 hz; +u16 hz;/* expressed in HZ / 10 */ That is in the non obvious category. Maybe best bet is to switch to millihz and make the type bigger if needed?
Hi Jonathan,
ack, I will post a v2.
Regards,
Lorenzo
Quoted 389 lines
Thanks,
Jonathan
Quoted 383 lines
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +0
-0u8 val; };drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +92
-89@@ -127,12 +127,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x20, .mask = GENMASK(7, 5), }, - .odr_avl[0] = { 10, 0x01 }, - .odr_avl[1] = { 50, 0x02 }, - .odr_avl[2] = { 119, 0x03 }, - .odr_avl[3] = { 238, 0x04 }, - .odr_avl[4] = { 476, 0x05 }, - .odr_avl[5] = { 952, 0x06 }, + .odr_avl[0] = { 100, 0x01 }, + .odr_avl[1] = { 500, 0x02 }, + .odr_avl[2] = { 1190, 0x03 }, + .odr_avl[3] = { 2380, 0x04 }, + .odr_avl[4] = { 4760, 0x05 }, + .odr_avl[5] = { 9520, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -140,12 +140,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 5), }, - .odr_avl[0] = { 15, 0x01 }, - .odr_avl[1] = { 60, 0x02 }, - .odr_avl[2] = { 119, 0x03 }, - .odr_avl[3] = { 238, 0x04 }, - .odr_avl[4] = { 476, 0x05 }, - .odr_avl[5] = { 952, 0x06 }, + .odr_avl[0] = { 149, 0x01 }, + .odr_avl[1] = { 595, 0x02 }, + .odr_avl[2] = { 1190, 0x03 }, + .odr_avl[3] = { 2380, 0x04 }, + .odr_avl[4] = { 4760, 0x05 }, + .odr_avl[5] = { 9520, 0x06 }, .odr_len = 6, }, },@@ -229,12 +229,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -242,12 +242,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, },@@ -395,12 +395,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -408,12 +408,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, },@@ -570,12 +570,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -583,12 +583,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, },@@ -747,12 +747,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -760,12 +760,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, },@@ -944,12 +944,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -957,12 +957,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, },@@ -1121,12 +1121,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = {@@ -1134,12 +1134,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, },@@ -1475,7 +1475,7 @@ static int st_lsm6dsx_read_oneshot(struct st_lsm6dsx_sensor *sensor,if (err <0 )return err; - delay =1000000 / sensor->odr; + delay =10000000 / sensor->odr;usleep_range (delay,2 * delay); err =st_lsm6dsx_read_locked (hw, addr, &data,sizeof (data));@@ -1507,8 +1507,9 @@ static int st_lsm6dsx_read_raw(struct iio_dev *iio_dev,iio_device_release_direct_mode (iio_dev);break ;case IIO_CHAN_INFO_SAMP_FREQ : - *val = sensor->odr; - ret =IIO_VAL_INT ; + *val = sensor->odr /10 ; + *val2 = (sensor->odr %10 ) *100000 ; + ret =IIO_VAL_INT_PLUS_MICRO ;break ;case IIO_CHAN_INFO_SCALE : *val =0 ;@@ -1541,6 +1542,7 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio_dev,case IIO_CHAN_INFO_SAMP_FREQ : {u8 data; + val = val *10 + val2 /100000 ; val =st_lsm6dsx_check_odr (sensor, val, &data);if (val <0 ) err = val;@@ -1730,8 +1732,9 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev, odr_table = &sensor->hw->settings->odr_table[sensor->id];for (i =0 ; i < odr_table->odr_len; i++) - len +=scnprintf (buf + len,PAGE_SIZE - len,"%d " , - odr_table->odr_avl[i].hz); + len +=scnprintf (buf + len,PAGE_SIZE - len,"%d.%d " , + odr_table->odr_avl[i].hz /10 , + odr_table->odr_avl[i].hz %10 ); buf[len -1 ] ='\n' ;return len;drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +13
-10@@ -51,10 +51,10 @@ static const struct st_lsm6dsx_ext_dev_settings st_lsm6dsx_ext_dev_table[] = { .addr = 0x60, .mask = GENMASK(3, 2), }, - .odr_avl[0] = { 10, 0x0 }, - .odr_avl[1] = { 20, 0x1 }, - .odr_avl[2] = { 50, 0x2 }, - .odr_avl[3] = { 100, 0x3 }, + .odr_avl[0] = { 100, 0x0 }, + .odr_avl[1] = { 200, 0x1 }, + .odr_avl[2] = { 500, 0x2 }, + .odr_avl[3] = { 1000, 0x3 }, .odr_len = 4, }, .fs_table = {@@ -97,8 +97,8 @@ static void st_lsm6dsx_shub_wait_complete(struct st_lsm6dsx_hw *hw)u16 odr; sensor =iio_priv (hw->iio_devs[ST_LSM6DSX_ID_ACC ]); - odr = (hw->enable_mask &BIT (ST_LSM6DSX_ID_ACC )) ? sensor->odr :13 ; -msleep ((2000U / odr) +1 ); + odr = (hw->enable_mask &BIT (ST_LSM6DSX_ID_ACC )) ? sensor->odr :125 ; +msleep ((20000U / odr) +1 ); }/** @@ -442,7 +442,7 @@ st_lsm6dsx_shub_read_oneshot(struct st_lsm6dsx_sensor *sensor,if (err <0 )return err; - delay =1000000 / sensor->odr; + delay =10000000 / sensor->odr;usleep_range (delay,2 * delay); len =min_t (int,sizeof (data), ch->scan_type.realbits >>3 );@@ -482,8 +482,9 @@ st_lsm6dsx_shub_read_raw(struct iio_dev *iio_dev,iio_device_release_direct_mode (iio_dev);break ;case IIO_CHAN_INFO_SAMP_FREQ : - *val = sensor->odr; - ret =IIO_VAL_INT ; + *val = sensor->odr /10 ; + *val2 = (sensor->odr %10 ) *100000 ; + ret =IIO_VAL_INT_PLUS_MICRO ;break ;case IIO_CHAN_INFO_SCALE : *val =0 ;@@ -514,6 +515,7 @@ st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev,case IIO_CHAN_INFO_SAMP_FREQ : {u16 data; + val = val *10 + val2 /100000 ; err =st_lsm6dsx_shub_get_odr_val (sensor, val, &data);if (!err) sensor->odr = val;@@ -542,7 +544,8 @@ st_lsm6dsx_shub_sampling_freq_avail(struct device *dev,for (i =0 ; i < settings->odr_table.odr_len; i++) {u16 val = settings->odr_table.odr_avl[i].hz; - len +=scnprintf (buf + len,PAGE_SIZE - len,"%d " , val); + len +=scnprintf (buf + len,PAGE_SIZE - len,"%d.%d " , + val /10 , val %10 ); } buf[len -1 ] ='\n' ;