Skip to content

L
linux
Commit 59af4e20 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jonathan Cameron
Browse files
Options

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
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent cb7e1b50
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 12 deletions
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
View file @ 59af4e20
...@@ -113,7 +113,9 @@ struct st_lsm6dsx_odr { ...@@ -113,7 +113,9 @@ struct st_lsm6dsx_odr {
#define ST_LSM6DSX_ODR_LIST_SIZE 6 #define ST_LSM6DSX_ODR_LIST_SIZE 6
struct st_lsm6dsx_odr_table_entry { struct st_lsm6dsx_odr_table_entry {
struct st_lsm6dsx_reg reg; struct st_lsm6dsx_reg reg;
struct st_lsm6dsx_odr odr_avl[ST_LSM6DSX_ODR_LIST_SIZE]; struct st_lsm6dsx_odr odr_avl[ST_LSM6DSX_ODR_LIST_SIZE];
int odr_len;
}; };
struct st_lsm6dsx_fs { struct st_lsm6dsx_fs {
......
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
View file @ 59af4e20
...@@ -133,6 +133,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -133,6 +133,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 238, 0x04 }, .odr_avl[3] = { 238, 0x04 },
.odr_avl[4] = { 476, 0x05 }, .odr_avl[4] = { 476, 0x05 },
.odr_avl[5] = { 952, 0x06 }, .odr_avl[5] = { 952, 0x06 },
.odr_len = 6,
}, },
[ST_LSM6DSX_ID_GYRO] = { [ST_LSM6DSX_ID_GYRO] = {
.reg = { .reg = {
...@@ -145,6 +146,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -145,6 +146,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 238, 0x04 }, .odr_avl[3] = { 238, 0x04 },
.odr_avl[4] = { 476, 0x05 }, .odr_avl[4] = { 476, 0x05 },
.odr_avl[5] = { 952, 0x06 }, .odr_avl[5] = { 952, 0x06 },
.odr_len = 6,
}, },
}, },
.fs_table = { .fs_table = {
...@@ -233,6 +235,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -233,6 +235,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 104, 0x04 }, .odr_avl[3] = { 104, 0x04 },
.odr_avl[4] = { 208, 0x05 }, .odr_avl[4] = { 208, 0x05 },
.odr_avl[5] = { 416, 0x06 }, .odr_avl[5] = { 416, 0x06 },
.odr_len = 6,
}, },
[ST_LSM6DSX_ID_GYRO] = { [ST_LSM6DSX_ID_GYRO] = {
.reg = { .reg = {
...@@ -245,6 +248,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -245,6 +248,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 104, 0x04 }, .odr_avl[3] = { 104, 0x04 },
.odr_avl[4] = { 208, 0x05 }, .odr_avl[4] = { 208, 0x05 },
.odr_avl[5] = { 416, 0x06 }, .odr_avl[5] = { 416, 0x06 },
.odr_len = 6,
}, },
}, },
.fs_table = { .fs_table = {
...@@ -397,6 +401,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -397,6 +401,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 104, 0x04 }, .odr_avl[3] = { 104, 0x04 },
.odr_avl[4] = { 208, 0x05 }, .odr_avl[4] = { 208, 0x05 },
.odr_avl[5] = { 416, 0x06 }, .odr_avl[5] = { 416, 0x06 },
.odr_len = 6,
}, },
[ST_LSM6DSX_ID_GYRO] = { [ST_LSM6DSX_ID_GYRO] = {
.reg = { .reg = {
...@@ -409,6 +414,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -409,6 +414,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 104, 0x04 }, .odr_avl[3] = { 104, 0x04 },
.odr_avl[4] = { 208, 0x05 }, .odr_avl[4] = { 208, 0x05 },
.odr_avl[5] = { 416, 0x06 }, .odr_avl[5] = { 416, 0x06 },
.odr_len = 6,
}, },
}, },
.fs_table = { .fs_table = {
...@@ -570,6 +576,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -570,6 +576,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 104, 0x04 }, .odr_avl[3] = { 104, 0x04 },
.odr_avl[4] = { 208, 0x05 }, .odr_avl[4] = { 208, 0x05 },
.odr_avl[5] = { 416, 0x06 }, .odr_avl[5] = { 416, 0x06 },
.odr_len = 6,
}, },
[ST_LSM6DSX_ID_GYRO] = { [ST_LSM6DSX_ID_GYRO] = {
.reg = { .reg = {
...@@ -582,6 +589,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -582,6 +589,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 104, 0x04 }, .odr_avl[3] = { 104, 0x04 },
.odr_avl[4] = { 208, 0x05 }, .odr_avl[4] = { 208, 0x05 },
.odr_avl[5] = { 416, 0x06 }, .odr_avl[5] = { 416, 0x06 },
.odr_len = 6,
}, },
}, },
.fs_table = { .fs_table = {
...@@ -745,6 +753,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -745,6 +753,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 104, 0x04 }, .odr_avl[3] = { 104, 0x04 },
.odr_avl[4] = { 208, 0x05 }, .odr_avl[4] = { 208, 0x05 },
.odr_avl[5] = { 416, 0x06 }, .odr_avl[5] = { 416, 0x06 },
.odr_len = 6,
}, },
[ST_LSM6DSX_ID_GYRO] = { [ST_LSM6DSX_ID_GYRO] = {
.reg = { .reg = {
...@@ -757,6 +766,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -757,6 +766,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 104, 0x04 }, .odr_avl[3] = { 104, 0x04 },
.odr_avl[4] = { 208, 0x05 }, .odr_avl[4] = { 208, 0x05 },
.odr_avl[5] = { 416, 0x06 }, .odr_avl[5] = { 416, 0x06 },
.odr_len = 6,
}, },
}, },
.fs_table = { .fs_table = {
...@@ -940,6 +950,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -940,6 +950,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 104, 0x04 }, .odr_avl[3] = { 104, 0x04 },
.odr_avl[4] = { 208, 0x05 }, .odr_avl[4] = { 208, 0x05 },
.odr_avl[5] = { 416, 0x06 }, .odr_avl[5] = { 416, 0x06 },
.odr_len = 6,
}, },
[ST_LSM6DSX_ID_GYRO] = { [ST_LSM6DSX_ID_GYRO] = {
.reg = { .reg = {
...@@ -952,6 +963,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -952,6 +963,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 104, 0x04 }, .odr_avl[3] = { 104, 0x04 },
.odr_avl[4] = { 208, 0x05 }, .odr_avl[4] = { 208, 0x05 },
.odr_avl[5] = { 416, 0x06 }, .odr_avl[5] = { 416, 0x06 },
.odr_len = 6,
}, },
}, },
.fs_table = { .fs_table = {
...@@ -1115,6 +1127,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -1115,6 +1127,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 104, 0x04 }, .odr_avl[3] = { 104, 0x04 },
.odr_avl[4] = { 208, 0x05 }, .odr_avl[4] = { 208, 0x05 },
.odr_avl[5] = { 416, 0x06 }, .odr_avl[5] = { 416, 0x06 },
.odr_len = 6,
}, },
[ST_LSM6DSX_ID_GYRO] = { [ST_LSM6DSX_ID_GYRO] = {
.reg = { .reg = {
...@@ -1127,6 +1140,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -1127,6 +1140,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[3] = { 104, 0x04 }, .odr_avl[3] = { 104, 0x04 },
.odr_avl[4] = { 208, 0x05 }, .odr_avl[4] = { 208, 0x05 },
.odr_avl[5] = { 416, 0x06 }, .odr_avl[5] = { 416, 0x06 },
.odr_len = 6,
}, },
}, },
.fs_table = { .fs_table = {
...@@ -1350,15 +1364,16 @@ int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr, u8 *val) ...@@ -1350,15 +1364,16 @@ int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr, u8 *val)
int i; int i;
odr_table = &sensor->hw->settings->odr_table[sensor->id]; 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 * ext devices can run at different odr respect to
* accel sensor * accel sensor
*/ */
if (odr_table->odr_avl[i].hz >= odr) if (odr_table->odr_avl[i].hz >= odr)
break; break;
}
if (i == ST_LSM6DSX_ODR_LIST_SIZE) if (i == odr_table->odr_len)
return -EINVAL; return -EINVAL;
*val = odr_table->odr_avl[i].val; *val = odr_table->odr_avl[i].val;
...@@ -1709,13 +1724,13 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev, ...@@ -1709,13 +1724,13 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev,
char *buf) char *buf)
{ {
struct st_lsm6dsx_sensor *sensor = iio_priv(dev_get_drvdata(dev)); struct st_lsm6dsx_sensor *sensor = iio_priv(dev_get_drvdata(dev));
enum st_lsm6dsx_sensor_id id = sensor->id; const struct st_lsm6dsx_odr_table_entry *odr_table;
struct st_lsm6dsx_hw *hw = sensor->hw;
int i, len = 0; 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 ", 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'; buf[len - 1] = '\n';
return len; return len;
......
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
View file @ 59af4e20
...@@ -55,6 +55,7 @@ static const struct st_lsm6dsx_ext_dev_settings st_lsm6dsx_ext_dev_table[] = { ...@@ -55,6 +55,7 @@ static const struct st_lsm6dsx_ext_dev_settings st_lsm6dsx_ext_dev_table[] = {
.odr_avl[1] = { 20, 0x1 }, .odr_avl[1] = { 20, 0x1 },
.odr_avl[2] = { 50, 0x2 }, .odr_avl[2] = { 50, 0x2 },
.odr_avl[3] = { 100, 0x3 }, .odr_avl[3] = { 100, 0x3 },
.odr_len = 4,
}, },
.fs_table = { .fs_table = {
.fs_avl[0] = { .fs_avl[0] = {
...@@ -323,11 +324,12 @@ st_lsm6dsx_shub_get_odr_val(struct st_lsm6dsx_sensor *sensor, ...@@ -323,11 +324,12 @@ st_lsm6dsx_shub_get_odr_val(struct st_lsm6dsx_sensor *sensor,
int i; int i;
settings = sensor->ext_info.settings; 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) if (settings->odr_table.odr_avl[i].hz == odr)
break; break;
}
if (i == ST_LSM6DSX_ODR_LIST_SIZE) if (i == settings->odr_table.odr_len)
return -EINVAL; return -EINVAL;
*val = settings->odr_table.odr_avl[i].val; *val = settings->odr_table.odr_avl[i].val;
...@@ -537,12 +539,10 @@ st_lsm6dsx_shub_sampling_freq_avail(struct device *dev, ...@@ -537,12 +539,10 @@ st_lsm6dsx_shub_sampling_freq_avail(struct device *dev,
int i, len = 0; int i, len = 0;
settings = sensor->ext_info.settings; 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; 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'; buf[len - 1] = '\n';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7