* [PATCH 0/3] st_lsm6dsx: move {odr,fs}_table in
@ 2019-07-15 21:42 Lorenzo Bianconi
2019-07-15 21:42 ` [PATCH 1/3] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings Lorenzo Bianconi
` (3 more replies)
0 siblings, 4 replies; 14+ messages in thread
From: Lorenzo Bianconi @ 2019-07-15 21:42 UTC (permalink / raw)
To: jic23; +Cc: lorenzo.bianconi, linux-iio, martin.kepplinger
Move odr and gain table in st_lsm6dsx_sensor_settings maps in order to support
devices with different odr/fs definitions. This is a preliminary series to add
support for LSM9DS1
Lorenzo Bianconi (3):
iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings
iio: imu: st_lsm6dsx: move fs_table in st_lsm6dsx_sensor_settings
iio: imu: st_lsm6dsx: inline acc/gyro output regs
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 4 +
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 397 +++++++++++++++----
2 files changed, 316 insertions(+), 85 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/3] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings
2019-07-15 21:42 [PATCH 0/3] st_lsm6dsx: move {odr,fs}_table in Lorenzo Bianconi
@ 2019-07-15 21:42 ` Lorenzo Bianconi
2019-07-16 6:07 ` Martin Kepplinger
` (2 more replies)
2019-07-15 21:42 ` [PATCH 2/3] iio: imu: st_lsm6dsx: move fs_table " Lorenzo Bianconi
` (2 subsequent siblings)
3 siblings, 3 replies; 14+ messages in thread
From: Lorenzo Bianconi @ 2019-07-15 21:42 UTC (permalink / raw)
To: jic23; +Cc: lorenzo.bianconi, linux-iio, martin.kepplinger
Move sensor odr table in st_lsm6dsx_sensor_settings in order to support
sensors with different odr maps. This is a preliminary patch to add
support for LSM9DS1 sensor to st_lsm6dsx driver
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 196 ++++++++++++++++---
2 files changed, 166 insertions(+), 32 deletions(-)
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
index af379a5429ed..3a89f3f6e2c7 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
@@ -200,6 +200,7 @@ struct st_lsm6dsx_ext_dev_settings {
* @wai: Sensor WhoAmI default value.
* @max_fifo_size: Sensor max fifo length in FIFO words.
* @id: List of hw id/device name supported by the driver configuration.
+ * @odr_table: Hw sensors odr table (Hz + val).
* @decimator: List of decimator register info (addr + mask).
* @batch: List of FIFO batching register info (addr + mask).
* @fifo_ops: Sensor hw FIFO parameters.
@@ -213,6 +214,7 @@ struct st_lsm6dsx_settings {
enum st_lsm6dsx_hw_id hw_id;
const char *name;
} id[ST_LSM6DSX_MAX_ID];
+ struct st_lsm6dsx_odr_table_entry odr_table[2];
struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID];
struct st_lsm6dsx_reg batch[ST_LSM6DSX_MAX_ID];
struct st_lsm6dsx_fifo_ops fifo_ops;
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
index d8c4417cf4eb..b3c6c9792913 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
@@ -69,33 +69,6 @@
#define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
#define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
-static const struct st_lsm6dsx_odr_table_entry st_lsm6dsx_odr_table[] = {
- [ST_LSM6DSX_ID_ACC] = {
- .reg = {
- .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 },
- },
- [ST_LSM6DSX_ID_GYRO] = {
- .reg = {
- .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 },
- }
-};
-
static const struct st_lsm6dsx_fs_table_entry st_lsm6dsx_fs_table[] = {
[ST_LSM6DSX_ID_ACC] = {
.reg = {
@@ -129,6 +102,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.name = ST_LSM6DS3_DEV_NAME,
},
},
+ .odr_table = {
+ [ST_LSM6DSX_ID_ACC] = {
+ .reg = {
+ .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 },
+ },
+ [ST_LSM6DSX_ID_GYRO] = {
+ .reg = {
+ .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 },
+ },
+ },
.decimator = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x08,
@@ -179,6 +178,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.name = ST_LSM6DS3H_DEV_NAME,
},
},
+ .odr_table = {
+ [ST_LSM6DSX_ID_ACC] = {
+ .reg = {
+ .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 },
+ },
+ [ST_LSM6DSX_ID_GYRO] = {
+ .reg = {
+ .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 },
+ },
+ },
.decimator = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x08,
@@ -238,6 +263,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.name = ST_LSM6DS3TRC_DEV_NAME,
},
},
+ .odr_table = {
+ [ST_LSM6DSX_ID_ACC] = {
+ .reg = {
+ .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 },
+ },
+ [ST_LSM6DSX_ID_GYRO] = {
+ .reg = {
+ .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 },
+ },
+ },
.decimator = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x08,
@@ -291,6 +342,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.name = ST_LSM6DSOX_DEV_NAME,
},
},
+ .odr_table = {
+ [ST_LSM6DSX_ID_ACC] = {
+ .reg = {
+ .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 },
+ },
+ [ST_LSM6DSX_ID_GYRO] = {
+ .reg = {
+ .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 },
+ },
+ },
.batch = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x09,
@@ -359,6 +436,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.name = ST_ASM330LHH_DEV_NAME,
},
},
+ .odr_table = {
+ [ST_LSM6DSX_ID_ACC] = {
+ .reg = {
+ .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 },
+ },
+ [ST_LSM6DSX_ID_GYRO] = {
+ .reg = {
+ .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 },
+ },
+ },
.batch = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x09,
@@ -401,6 +504,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.name = ST_LSM6DSR_DEV_NAME,
},
},
+ .odr_table = {
+ [ST_LSM6DSX_ID_ACC] = {
+ .reg = {
+ .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 },
+ },
+ [ST_LSM6DSX_ID_GYRO] = {
+ .reg = {
+ .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 },
+ },
+ },
.batch = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x09,
@@ -563,20 +692,22 @@ static int st_lsm6dsx_set_full_scale(struct st_lsm6dsx_sensor *sensor,
int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr, u8 *val)
{
+ const struct st_lsm6dsx_odr_table_entry *odr_table;
int i;
+ odr_table = &sensor->hw->settings->odr_table[sensor->id];
for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++)
/*
* ext devices can run at different odr respect to
* accel sensor
*/
- if (st_lsm6dsx_odr_table[sensor->id].odr_avl[i].hz >= odr)
+ if (odr_table->odr_avl[i].hz >= odr)
break;
if (i == ST_LSM6DSX_ODR_LIST_SIZE)
return -EINVAL;
- *val = st_lsm6dsx_odr_table[sensor->id].odr_avl[i].val;
+ *val = odr_table->odr_avl[i].val;
return 0;
}
@@ -641,7 +772,7 @@ static int st_lsm6dsx_set_odr(struct st_lsm6dsx_sensor *sensor, u16 req_odr)
return err;
}
- reg = &st_lsm6dsx_odr_table[ref_sensor->id].reg;
+ reg = &hw->settings->odr_table[ref_sensor->id].reg;
data = ST_LSM6DSX_SHIFT_VAL(val, reg->mask);
return st_lsm6dsx_update_bits_locked(hw, reg->addr, reg->mask, data);
}
@@ -786,11 +917,12 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev,
{
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;
int i, len = 0;
for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++)
len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
- st_lsm6dsx_odr_table[id].odr_avl[i].hz);
+ hw->settings->odr_table[id].odr_avl[i].hz);
buf[len - 1] = '\n';
return len;
@@ -1040,7 +1172,7 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,
sensor = iio_priv(iio_dev);
sensor->id = id;
sensor->hw = hw;
- sensor->odr = st_lsm6dsx_odr_table[id].odr_avl[0].hz;
+ sensor->odr = hw->settings->odr_table[id].odr_avl[0].hz;
sensor->gain = st_lsm6dsx_fs_table[id].fs_avl[0].gain;
sensor->watermark = 1;
--
2.21.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/3] iio: imu: st_lsm6dsx: move fs_table in st_lsm6dsx_sensor_settings
2019-07-15 21:42 [PATCH 0/3] st_lsm6dsx: move {odr,fs}_table in Lorenzo Bianconi
2019-07-15 21:42 ` [PATCH 1/3] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings Lorenzo Bianconi
@ 2019-07-15 21:42 ` Lorenzo Bianconi
2019-07-16 7:18 ` Martin Kepplinger
2019-07-16 9:13 ` Martin Kepplinger
2019-07-15 21:42 ` [PATCH 3/3] iio: imu: st_lsm6dsx: inline acc/gyro output regs Lorenzo Bianconi
2019-07-23 5:41 ` [PATCH 0/3] st_lsm6dsx: move {odr,fs}_table in Martin Kepplinger
3 siblings, 2 replies; 14+ messages in thread
From: Lorenzo Bianconi @ 2019-07-15 21:42 UTC (permalink / raw)
To: jic23; +Cc: lorenzo.bianconi, linux-iio, martin.kepplinger
Move fs_table in st_lsm6dsx_sensor_settings in order to support
sensors with different gain maps. This is a preliminary patch to add
support for LSM9DS1 sensor to st_lsm6dsx driver
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 175 +++++++++++++++----
2 files changed, 144 insertions(+), 33 deletions(-)
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
index 3a89f3f6e2c7..ab1c66615d67 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
@@ -201,6 +201,7 @@ struct st_lsm6dsx_ext_dev_settings {
* @max_fifo_size: Sensor max fifo length in FIFO words.
* @id: List of hw id/device name supported by the driver configuration.
* @odr_table: Hw sensors odr table (Hz + val).
+ * @fs_table: Hw sensors gain table (gain + val).
* @decimator: List of decimator register info (addr + mask).
* @batch: List of FIFO batching register info (addr + mask).
* @fifo_ops: Sensor hw FIFO parameters.
@@ -215,6 +216,7 @@ struct st_lsm6dsx_settings {
const char *name;
} id[ST_LSM6DSX_MAX_ID];
struct st_lsm6dsx_odr_table_entry odr_table[2];
+ struct st_lsm6dsx_fs_table_entry fs_table[2];
struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID];
struct st_lsm6dsx_reg batch[ST_LSM6DSX_MAX_ID];
struct st_lsm6dsx_fifo_ops fifo_ops;
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
index b3c6c9792913..9aa109428a52 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
@@ -69,29 +69,6 @@
#define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
#define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
-static const struct st_lsm6dsx_fs_table_entry st_lsm6dsx_fs_table[] = {
- [ST_LSM6DSX_ID_ACC] = {
- .reg = {
- .addr = 0x10,
- .mask = GENMASK(3, 2),
- },
- .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
- .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
- .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
- .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
- },
- [ST_LSM6DSX_ID_GYRO] = {
- .reg = {
- .addr = 0x11,
- .mask = GENMASK(3, 2),
- },
- .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
- .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
- .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
- .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
- }
-};
-
static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
{
.wai = 0x69,
@@ -128,6 +105,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[5] = { 416, 0x06 },
},
},
+ .fs_table = {
+ [ST_LSM6DSX_ID_ACC] = {
+ .reg = {
+ .addr = 0x10,
+ .mask = GENMASK(3, 2),
+ },
+ .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
+ .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
+ .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
+ .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
+ },
+ [ST_LSM6DSX_ID_GYRO] = {
+ .reg = {
+ .addr = 0x11,
+ .mask = GENMASK(3, 2),
+ },
+ .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
+ .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
+ .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
+ .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
+ },
+ },
.decimator = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x08,
@@ -204,6 +203,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[5] = { 416, 0x06 },
},
},
+ .fs_table = {
+ [ST_LSM6DSX_ID_ACC] = {
+ .reg = {
+ .addr = 0x10,
+ .mask = GENMASK(3, 2),
+ },
+ .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
+ .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
+ .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
+ .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
+ },
+ [ST_LSM6DSX_ID_GYRO] = {
+ .reg = {
+ .addr = 0x11,
+ .mask = GENMASK(3, 2),
+ },
+ .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
+ .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
+ .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
+ .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
+ },
+ },
.decimator = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x08,
@@ -289,6 +310,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[5] = { 416, 0x06 },
},
},
+ .fs_table = {
+ [ST_LSM6DSX_ID_ACC] = {
+ .reg = {
+ .addr = 0x10,
+ .mask = GENMASK(3, 2),
+ },
+ .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
+ .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
+ .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
+ .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
+ },
+ [ST_LSM6DSX_ID_GYRO] = {
+ .reg = {
+ .addr = 0x11,
+ .mask = GENMASK(3, 2),
+ },
+ .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
+ .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
+ .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
+ .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
+ },
+ },
.decimator = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x08,
@@ -368,6 +411,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[5] = { 416, 0x06 },
},
},
+ .fs_table = {
+ [ST_LSM6DSX_ID_ACC] = {
+ .reg = {
+ .addr = 0x10,
+ .mask = GENMASK(3, 2),
+ },
+ .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
+ .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
+ .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
+ .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
+ },
+ [ST_LSM6DSX_ID_GYRO] = {
+ .reg = {
+ .addr = 0x11,
+ .mask = GENMASK(3, 2),
+ },
+ .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
+ .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
+ .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
+ .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
+ },
+ },
.batch = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x09,
@@ -462,6 +527,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[5] = { 416, 0x06 },
},
},
+ .fs_table = {
+ [ST_LSM6DSX_ID_ACC] = {
+ .reg = {
+ .addr = 0x10,
+ .mask = GENMASK(3, 2),
+ },
+ .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
+ .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
+ .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
+ .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
+ },
+ [ST_LSM6DSX_ID_GYRO] = {
+ .reg = {
+ .addr = 0x11,
+ .mask = GENMASK(3, 2),
+ },
+ .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
+ .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
+ .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
+ .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
+ },
+ },
.batch = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x09,
@@ -530,6 +617,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.odr_avl[5] = { 416, 0x06 },
},
},
+ .fs_table = {
+ [ST_LSM6DSX_ID_ACC] = {
+ .reg = {
+ .addr = 0x10,
+ .mask = GENMASK(3, 2),
+ },
+ .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
+ .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
+ .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
+ .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
+ },
+ [ST_LSM6DSX_ID_GYRO] = {
+ .reg = {
+ .addr = 0x11,
+ .mask = GENMASK(3, 2),
+ },
+ .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
+ .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
+ .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
+ .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
+ },
+ },
.batch = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x09,
@@ -665,23 +774,22 @@ static int st_lsm6dsx_check_whoami(struct st_lsm6dsx_hw *hw, int id,
static int st_lsm6dsx_set_full_scale(struct st_lsm6dsx_sensor *sensor,
u32 gain)
{
- struct st_lsm6dsx_hw *hw = sensor->hw;
- const struct st_lsm6dsx_reg *reg;
+ const struct st_lsm6dsx_fs_table_entry *fs_table;
unsigned int data;
int i, err;
- u8 val;
+ fs_table = &sensor->hw->settings->fs_table[sensor->id];
for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++)
- if (st_lsm6dsx_fs_table[sensor->id].fs_avl[i].gain == gain)
+ if (fs_table->fs_avl[i].gain == gain)
break;
if (i == ST_LSM6DSX_FS_LIST_SIZE)
return -EINVAL;
- val = st_lsm6dsx_fs_table[sensor->id].fs_avl[i].val;
- reg = &st_lsm6dsx_fs_table[sensor->id].reg;
- data = ST_LSM6DSX_SHIFT_VAL(val, reg->mask);
- err = st_lsm6dsx_update_bits_locked(hw, reg->addr, reg->mask, data);
+ data = ST_LSM6DSX_SHIFT_VAL(fs_table->fs_avl[i].val,
+ fs_table->reg.mask);
+ err = st_lsm6dsx_update_bits_locked(sensor->hw, fs_table->reg.addr,
+ fs_table->reg.mask, data);
if (err < 0)
return err;
@@ -934,11 +1042,12 @@ static ssize_t st_lsm6dsx_sysfs_scale_avail(struct device *dev,
{
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;
int i, len = 0;
for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++)
len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
- st_lsm6dsx_fs_table[id].fs_avl[i].gain);
+ hw->settings->fs_table[id].fs_avl[i].gain);
buf[len - 1] = '\n';
return len;
@@ -1173,7 +1282,7 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,
sensor->id = id;
sensor->hw = hw;
sensor->odr = hw->settings->odr_table[id].odr_avl[0].hz;
- sensor->gain = st_lsm6dsx_fs_table[id].fs_avl[0].gain;
+ sensor->gain = hw->settings->fs_table[id].fs_avl[0].gain;
sensor->watermark = 1;
switch (id) {
--
2.21.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/3] iio: imu: st_lsm6dsx: inline acc/gyro output regs
2019-07-15 21:42 [PATCH 0/3] st_lsm6dsx: move {odr,fs}_table in Lorenzo Bianconi
2019-07-15 21:42 ` [PATCH 1/3] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings Lorenzo Bianconi
2019-07-15 21:42 ` [PATCH 2/3] iio: imu: st_lsm6dsx: move fs_table " Lorenzo Bianconi
@ 2019-07-15 21:42 ` Lorenzo Bianconi
2019-07-16 6:04 ` Martin Kepplinger
2019-07-23 5:41 ` [PATCH 0/3] st_lsm6dsx: move {odr,fs}_table in Martin Kepplinger
3 siblings, 1 reply; 14+ messages in thread
From: Lorenzo Bianconi @ 2019-07-15 21:42 UTC (permalink / raw)
To: jic23; +Cc: lorenzo.bianconi, linux-iio, martin.kepplinger
Remove output register definitions and inline register values since
they are used only for iio channel definitions. This is a preliminary
patch to add support for LSM9DS1 sensor to st_lsm6dsx driver
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 26 +++++---------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
index 9aa109428a52..0abd5b85b398 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
@@ -61,14 +61,6 @@
#define ST_LSM6DSX_REG_INT2_ON_INT1_ADDR 0x13
#define ST_LSM6DSX_REG_INT2_ON_INT1_MASK BIT(5)
-#define ST_LSM6DSX_REG_ACC_OUT_X_L_ADDR 0x28
-#define ST_LSM6DSX_REG_ACC_OUT_Y_L_ADDR 0x2a
-#define ST_LSM6DSX_REG_ACC_OUT_Z_L_ADDR 0x2c
-
-#define ST_LSM6DSX_REG_GYRO_OUT_X_L_ADDR 0x22
-#define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
-#define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
-
static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
{
.wai = 0x69,
@@ -701,22 +693,16 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
};
static const struct iio_chan_spec st_lsm6dsx_acc_channels[] = {
- ST_LSM6DSX_CHANNEL(IIO_ACCEL, ST_LSM6DSX_REG_ACC_OUT_X_L_ADDR,
- IIO_MOD_X, 0),
- ST_LSM6DSX_CHANNEL(IIO_ACCEL, ST_LSM6DSX_REG_ACC_OUT_Y_L_ADDR,
- IIO_MOD_Y, 1),
- ST_LSM6DSX_CHANNEL(IIO_ACCEL, ST_LSM6DSX_REG_ACC_OUT_Z_L_ADDR,
- IIO_MOD_Z, 2),
+ ST_LSM6DSX_CHANNEL(IIO_ACCEL, 0x28, IIO_MOD_X, 0),
+ ST_LSM6DSX_CHANNEL(IIO_ACCEL, 0x2a, IIO_MOD_Y, 1),
+ ST_LSM6DSX_CHANNEL(IIO_ACCEL, 0x2c, IIO_MOD_Z, 2),
IIO_CHAN_SOFT_TIMESTAMP(3),
};
static const struct iio_chan_spec st_lsm6dsx_gyro_channels[] = {
- ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, ST_LSM6DSX_REG_GYRO_OUT_X_L_ADDR,
- IIO_MOD_X, 0),
- ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR,
- IIO_MOD_Y, 1),
- ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR,
- IIO_MOD_Z, 2),
+ ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, 0x22, IIO_MOD_X, 0),
+ ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, 0x24, IIO_MOD_Y, 1),
+ ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, 0x26, IIO_MOD_Z, 2),
IIO_CHAN_SOFT_TIMESTAMP(3),
};
--
2.21.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 3/3] iio: imu: st_lsm6dsx: inline acc/gyro output regs
2019-07-15 21:42 ` [PATCH 3/3] iio: imu: st_lsm6dsx: inline acc/gyro output regs Lorenzo Bianconi
@ 2019-07-16 6:04 ` Martin Kepplinger
2019-07-16 6:24 ` Lorenzo Bianconi
0 siblings, 1 reply; 14+ messages in thread
From: Martin Kepplinger @ 2019-07-16 6:04 UTC (permalink / raw)
To: Lorenzo Bianconi, jic23; +Cc: lorenzo.bianconi, linux-iio
On 15.07.19 23:42, Lorenzo Bianconi wrote:
> Remove output register definitions and inline register values since
> they are used only for iio channel definitions. This is a preliminary
> patch to add support for LSM9DS1 sensor to st_lsm6dsx driver
>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 26 +++++---------------
> 1 file changed, 6 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index 9aa109428a52..0abd5b85b398 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -61,14 +61,6 @@
> #define ST_LSM6DSX_REG_INT2_ON_INT1_ADDR 0x13
> #define ST_LSM6DSX_REG_INT2_ON_INT1_MASK BIT(5)
>
> -#define ST_LSM6DSX_REG_ACC_OUT_X_L_ADDR 0x28
> -#define ST_LSM6DSX_REG_ACC_OUT_Y_L_ADDR 0x2a
> -#define ST_LSM6DSX_REG_ACC_OUT_Z_L_ADDR 0x2c
> -
> -#define ST_LSM6DSX_REG_GYRO_OUT_X_L_ADDR 0x22
> -#define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
> -#define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
> -
> static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> {
> .wai = 0x69,
> @@ -701,22 +693,16 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> };
>
> static const struct iio_chan_spec st_lsm6dsx_acc_channels[] = {
> - ST_LSM6DSX_CHANNEL(IIO_ACCEL, ST_LSM6DSX_REG_ACC_OUT_X_L_ADDR,
> - IIO_MOD_X, 0),
> - ST_LSM6DSX_CHANNEL(IIO_ACCEL, ST_LSM6DSX_REG_ACC_OUT_Y_L_ADDR,
> - IIO_MOD_Y, 1),
> - ST_LSM6DSX_CHANNEL(IIO_ACCEL, ST_LSM6DSX_REG_ACC_OUT_Z_L_ADDR,
> - IIO_MOD_Z, 2),
> + ST_LSM6DSX_CHANNEL(IIO_ACCEL, 0x28, IIO_MOD_X, 0),
> + ST_LSM6DSX_CHANNEL(IIO_ACCEL, 0x2a, IIO_MOD_Y, 1),
> + ST_LSM6DSX_CHANNEL(IIO_ACCEL, 0x2c, IIO_MOD_Z, 2),
> IIO_CHAN_SOFT_TIMESTAMP(3),
> };
>
> static const struct iio_chan_spec st_lsm6dsx_gyro_channels[] = {
> - ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, ST_LSM6DSX_REG_GYRO_OUT_X_L_ADDR,
> - IIO_MOD_X, 0),
> - ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR,
> - IIO_MOD_Y, 1),
> - ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR,
> - IIO_MOD_Z, 2),
> + ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, 0x22, IIO_MOD_X, 0),
> + ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, 0x24, IIO_MOD_Y, 1),
> + ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, 0x26, IIO_MOD_Z, 2),
> IIO_CHAN_SOFT_TIMESTAMP(3),
> };
>
>
The definitions don't hurt, even if only used once, or do they?
thanks,
martin
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings
2019-07-15 21:42 ` [PATCH 1/3] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings Lorenzo Bianconi
@ 2019-07-16 6:07 ` Martin Kepplinger
2019-07-16 6:25 ` Lorenzo Bianconi
2019-07-16 7:17 ` Martin Kepplinger
2019-07-16 9:13 ` Martin Kepplinger
2 siblings, 1 reply; 14+ messages in thread
From: Martin Kepplinger @ 2019-07-16 6:07 UTC (permalink / raw)
To: Lorenzo Bianconi, jic23; +Cc: lorenzo.bianconi, linux-iio
On 15.07.19 23:42, Lorenzo Bianconi wrote:
> Move sensor odr table in st_lsm6dsx_sensor_settings in order to support
> sensors with different odr maps. This is a preliminary patch to add
> support for LSM9DS1 sensor to st_lsm6dsx driver
>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 196 ++++++++++++++++---
> 2 files changed, 166 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> index af379a5429ed..3a89f3f6e2c7 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> @@ -200,6 +200,7 @@ struct st_lsm6dsx_ext_dev_settings {
> * @wai: Sensor WhoAmI default value.
> * @max_fifo_size: Sensor max fifo length in FIFO words.
> * @id: List of hw id/device name supported by the driver configuration.
> + * @odr_table: Hw sensors odr table (Hz + val).
> * @decimator: List of decimator register info (addr + mask).
> * @batch: List of FIFO batching register info (addr + mask).
> * @fifo_ops: Sensor hw FIFO parameters.
> @@ -213,6 +214,7 @@ struct st_lsm6dsx_settings {
> enum st_lsm6dsx_hw_id hw_id;
> const char *name;
> } id[ST_LSM6DSX_MAX_ID];
> + struct st_lsm6dsx_odr_table_entry odr_table[2];
> struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID];
> struct st_lsm6dsx_reg batch[ST_LSM6DSX_MAX_ID];
> struct st_lsm6dsx_fifo_ops fifo_ops;
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index d8c4417cf4eb..b3c6c9792913 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -69,33 +69,6 @@
> #define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
> #define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
>
> -static const struct st_lsm6dsx_odr_table_entry st_lsm6dsx_odr_table[] = {
> - [ST_LSM6DSX_ID_ACC] = {
> - .reg = {
> - .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 },
> - },
> - [ST_LSM6DSX_ID_GYRO] = {
> - .reg = {
> - .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 },
> - }
> -};
> -
> static const struct st_lsm6dsx_fs_table_entry st_lsm6dsx_fs_table[] = {
> [ST_LSM6DSX_ID_ACC] = {
> .reg = {
> @@ -129,6 +102,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DS3_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -179,6 +178,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DS3H_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -238,6 +263,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DS3TRC_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -291,6 +342,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DSOX_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -359,6 +436,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_ASM330LHH_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -401,6 +504,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DSR_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -563,20 +692,22 @@ static int st_lsm6dsx_set_full_scale(struct st_lsm6dsx_sensor *sensor,
>
> int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr, u8 *val)
> {
> + const struct st_lsm6dsx_odr_table_entry *odr_table;
> int i;
>
> + odr_table = &sensor->hw->settings->odr_table[sensor->id];
> for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++)
> /*
> * ext devices can run at different odr respect to
> * accel sensor
> */
> - if (st_lsm6dsx_odr_table[sensor->id].odr_avl[i].hz >= odr)
> + if (odr_table->odr_avl[i].hz >= odr)
> break;
>
> if (i == ST_LSM6DSX_ODR_LIST_SIZE)
> return -EINVAL;
>
> - *val = st_lsm6dsx_odr_table[sensor->id].odr_avl[i].val;
> + *val = odr_table->odr_avl[i].val;
>
> return 0;
> }
> @@ -641,7 +772,7 @@ static int st_lsm6dsx_set_odr(struct st_lsm6dsx_sensor *sensor, u16 req_odr)
> return err;
> }
>
> - reg = &st_lsm6dsx_odr_table[ref_sensor->id].reg;
> + reg = &hw->settings->odr_table[ref_sensor->id].reg;
> data = ST_LSM6DSX_SHIFT_VAL(val, reg->mask);
> return st_lsm6dsx_update_bits_locked(hw, reg->addr, reg->mask, data);
> }
> @@ -786,11 +917,12 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev,
> {
> 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;
> int i, len = 0;
>
> for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++)
> len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
> - st_lsm6dsx_odr_table[id].odr_avl[i].hz);
> + hw->settings->odr_table[id].odr_avl[i].hz);
> buf[len - 1] = '\n';
>
> return len;
> @@ -1040,7 +1172,7 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,
> sensor = iio_priv(iio_dev);
> sensor->id = id;
> sensor->hw = hw;
> - sensor->odr = st_lsm6dsx_odr_table[id].odr_avl[0].hz;
> + sensor->odr = hw->settings->odr_table[id].odr_avl[0].hz;
> sensor->gain = st_lsm6dsx_fs_table[id].fs_avl[0].gain;
> sensor->watermark = 1;
>
>
Makes sense to me, thanks! What tree do you build this against though?
At least to the current -next tree, this doesn't apply.
thanks,
martin
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/3] iio: imu: st_lsm6dsx: inline acc/gyro output regs
2019-07-16 6:04 ` Martin Kepplinger
@ 2019-07-16 6:24 ` Lorenzo Bianconi
0 siblings, 0 replies; 14+ messages in thread
From: Lorenzo Bianconi @ 2019-07-16 6:24 UTC (permalink / raw)
To: Martin Kepplinger; +Cc: jic23, lorenzo.bianconi, linux-iio
[-- Attachment #1: Type: text/plain, Size: 2817 bytes --]
> On 15.07.19 23:42, Lorenzo Bianconi wrote:
> > Remove output register definitions and inline register values since
> > they are used only for iio channel definitions. This is a preliminary
> > patch to add support for LSM9DS1 sensor to st_lsm6dsx driver
> >
> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> > ---
> > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 26 +++++---------------
> > 1 file changed, 6 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > index 9aa109428a52..0abd5b85b398 100644
> > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > @@ -61,14 +61,6 @@
> > #define ST_LSM6DSX_REG_INT2_ON_INT1_ADDR 0x13
> > #define ST_LSM6DSX_REG_INT2_ON_INT1_MASK BIT(5)
> >
> > -#define ST_LSM6DSX_REG_ACC_OUT_X_L_ADDR 0x28
> > -#define ST_LSM6DSX_REG_ACC_OUT_Y_L_ADDR 0x2a
> > -#define ST_LSM6DSX_REG_ACC_OUT_Z_L_ADDR 0x2c
> > -
> > -#define ST_LSM6DSX_REG_GYRO_OUT_X_L_ADDR 0x22
> > -#define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
> > -#define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
> > -
> > static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > {
> > .wai = 0x69,
> > @@ -701,22 +693,16 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > };
> >
> > static const struct iio_chan_spec st_lsm6dsx_acc_channels[] = {
> > - ST_LSM6DSX_CHANNEL(IIO_ACCEL, ST_LSM6DSX_REG_ACC_OUT_X_L_ADDR,
> > - IIO_MOD_X, 0),
> > - ST_LSM6DSX_CHANNEL(IIO_ACCEL, ST_LSM6DSX_REG_ACC_OUT_Y_L_ADDR,
> > - IIO_MOD_Y, 1),
> > - ST_LSM6DSX_CHANNEL(IIO_ACCEL, ST_LSM6DSX_REG_ACC_OUT_Z_L_ADDR,
> > - IIO_MOD_Z, 2),
> > + ST_LSM6DSX_CHANNEL(IIO_ACCEL, 0x28, IIO_MOD_X, 0),
> > + ST_LSM6DSX_CHANNEL(IIO_ACCEL, 0x2a, IIO_MOD_Y, 1),
> > + ST_LSM6DSX_CHANNEL(IIO_ACCEL, 0x2c, IIO_MOD_Z, 2),
> > IIO_CHAN_SOFT_TIMESTAMP(3),
> > };
> >
> > static const struct iio_chan_spec st_lsm6dsx_gyro_channels[] = {
> > - ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, ST_LSM6DSX_REG_GYRO_OUT_X_L_ADDR,
> > - IIO_MOD_X, 0),
> > - ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR,
> > - IIO_MOD_Y, 1),
> > - ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR,
> > - IIO_MOD_Z, 2),
> > + ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, 0x22, IIO_MOD_X, 0),
> > + ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, 0x24, IIO_MOD_Y, 1),
> > + ST_LSM6DSX_CHANNEL(IIO_ANGL_VEL, 0x26, IIO_MOD_Z, 2),
> > IIO_CHAN_SOFT_TIMESTAMP(3),
> > };
> >
> >
>
> The definitions don't hurt, even if only used once, or do they?
>
> thanks,
we can avoid multiple definitions in this way
Lorenzo
> martin
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings
2019-07-16 6:07 ` Martin Kepplinger
@ 2019-07-16 6:25 ` Lorenzo Bianconi
0 siblings, 0 replies; 14+ messages in thread
From: Lorenzo Bianconi @ 2019-07-16 6:25 UTC (permalink / raw)
To: Martin Kepplinger; +Cc: jic23, lorenzo.bianconi, linux-iio
[-- Attachment #1: Type: text/plain, Size: 11537 bytes --]
> On 15.07.19 23:42, Lorenzo Bianconi wrote:
> > Move sensor odr table in st_lsm6dsx_sensor_settings in order to support
> > sensors with different odr maps. This is a preliminary patch to add
> > support for LSM9DS1 sensor to st_lsm6dsx driver
> >
> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> > ---
> > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +
> > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 196 ++++++++++++++++---
> > 2 files changed, 166 insertions(+), 32 deletions(-)
> >
> > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> > index af379a5429ed..3a89f3f6e2c7 100644
> > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> > @@ -200,6 +200,7 @@ struct st_lsm6dsx_ext_dev_settings {
> > * @wai: Sensor WhoAmI default value.
> > * @max_fifo_size: Sensor max fifo length in FIFO words.
> > * @id: List of hw id/device name supported by the driver configuration.
> > + * @odr_table: Hw sensors odr table (Hz + val).
> > * @decimator: List of decimator register info (addr + mask).
> > * @batch: List of FIFO batching register info (addr + mask).
> > * @fifo_ops: Sensor hw FIFO parameters.
> > @@ -213,6 +214,7 @@ struct st_lsm6dsx_settings {
> > enum st_lsm6dsx_hw_id hw_id;
> > const char *name;
> > } id[ST_LSM6DSX_MAX_ID];
> > + struct st_lsm6dsx_odr_table_entry odr_table[2];
> > struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID];
> > struct st_lsm6dsx_reg batch[ST_LSM6DSX_MAX_ID];
> > struct st_lsm6dsx_fifo_ops fifo_ops;
> > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > index d8c4417cf4eb..b3c6c9792913 100644
> > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > @@ -69,33 +69,6 @@
> > #define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
> > #define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
> >
> > -static const struct st_lsm6dsx_odr_table_entry st_lsm6dsx_odr_table[] = {
> > - [ST_LSM6DSX_ID_ACC] = {
> > - .reg = {
> > - .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 },
> > - },
> > - [ST_LSM6DSX_ID_GYRO] = {
> > - .reg = {
> > - .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 },
> > - }
> > -};
> > -
> > static const struct st_lsm6dsx_fs_table_entry st_lsm6dsx_fs_table[] = {
> > [ST_LSM6DSX_ID_ACC] = {
> > .reg = {
> > @@ -129,6 +102,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .name = ST_LSM6DS3_DEV_NAME,
> > },
> > },
> > + .odr_table = {
> > + [ST_LSM6DSX_ID_ACC] = {
> > + .reg = {
> > + .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 },
> > + },
> > + [ST_LSM6DSX_ID_GYRO] = {
> > + .reg = {
> > + .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 },
> > + },
> > + },
> > .decimator = {
> > [ST_LSM6DSX_ID_ACC] = {
> > .addr = 0x08,
> > @@ -179,6 +178,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .name = ST_LSM6DS3H_DEV_NAME,
> > },
> > },
> > + .odr_table = {
> > + [ST_LSM6DSX_ID_ACC] = {
> > + .reg = {
> > + .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 },
> > + },
> > + [ST_LSM6DSX_ID_GYRO] = {
> > + .reg = {
> > + .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 },
> > + },
> > + },
> > .decimator = {
> > [ST_LSM6DSX_ID_ACC] = {
> > .addr = 0x08,
> > @@ -238,6 +263,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .name = ST_LSM6DS3TRC_DEV_NAME,
> > },
> > },
> > + .odr_table = {
> > + [ST_LSM6DSX_ID_ACC] = {
> > + .reg = {
> > + .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 },
> > + },
> > + [ST_LSM6DSX_ID_GYRO] = {
> > + .reg = {
> > + .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 },
> > + },
> > + },
> > .decimator = {
> > [ST_LSM6DSX_ID_ACC] = {
> > .addr = 0x08,
> > @@ -291,6 +342,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .name = ST_LSM6DSOX_DEV_NAME,
> > },
> > },
> > + .odr_table = {
> > + [ST_LSM6DSX_ID_ACC] = {
> > + .reg = {
> > + .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 },
> > + },
> > + [ST_LSM6DSX_ID_GYRO] = {
> > + .reg = {
> > + .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 },
> > + },
> > + },
> > .batch = {
> > [ST_LSM6DSX_ID_ACC] = {
> > .addr = 0x09,
> > @@ -359,6 +436,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .name = ST_ASM330LHH_DEV_NAME,
> > },
> > },
> > + .odr_table = {
> > + [ST_LSM6DSX_ID_ACC] = {
> > + .reg = {
> > + .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 },
> > + },
> > + [ST_LSM6DSX_ID_GYRO] = {
> > + .reg = {
> > + .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 },
> > + },
> > + },
> > .batch = {
> > [ST_LSM6DSX_ID_ACC] = {
> > .addr = 0x09,
> > @@ -401,6 +504,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .name = ST_LSM6DSR_DEV_NAME,
> > },
> > },
> > + .odr_table = {
> > + [ST_LSM6DSX_ID_ACC] = {
> > + .reg = {
> > + .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 },
> > + },
> > + [ST_LSM6DSX_ID_GYRO] = {
> > + .reg = {
> > + .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 },
> > + },
> > + },
> > .batch = {
> > [ST_LSM6DSX_ID_ACC] = {
> > .addr = 0x09,
> > @@ -563,20 +692,22 @@ static int st_lsm6dsx_set_full_scale(struct st_lsm6dsx_sensor *sensor,
> >
> > int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr, u8 *val)
> > {
> > + const struct st_lsm6dsx_odr_table_entry *odr_table;
> > int i;
> >
> > + odr_table = &sensor->hw->settings->odr_table[sensor->id];
> > for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++)
> > /*
> > * ext devices can run at different odr respect to
> > * accel sensor
> > */
> > - if (st_lsm6dsx_odr_table[sensor->id].odr_avl[i].hz >= odr)
> > + if (odr_table->odr_avl[i].hz >= odr)
> > break;
> >
> > if (i == ST_LSM6DSX_ODR_LIST_SIZE)
> > return -EINVAL;
> >
> > - *val = st_lsm6dsx_odr_table[sensor->id].odr_avl[i].val;
> > + *val = odr_table->odr_avl[i].val;
> >
> > return 0;
> > }
> > @@ -641,7 +772,7 @@ static int st_lsm6dsx_set_odr(struct st_lsm6dsx_sensor *sensor, u16 req_odr)
> > return err;
> > }
> >
> > - reg = &st_lsm6dsx_odr_table[ref_sensor->id].reg;
> > + reg = &hw->settings->odr_table[ref_sensor->id].reg;
> > data = ST_LSM6DSX_SHIFT_VAL(val, reg->mask);
> > return st_lsm6dsx_update_bits_locked(hw, reg->addr, reg->mask, data);
> > }
> > @@ -786,11 +917,12 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev,
> > {
> > 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;
> > int i, len = 0;
> >
> > for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++)
> > len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
> > - st_lsm6dsx_odr_table[id].odr_avl[i].hz);
> > + hw->settings->odr_table[id].odr_avl[i].hz);
> > buf[len - 1] = '\n';
> >
> > return len;
> > @@ -1040,7 +1172,7 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,
> > sensor = iio_priv(iio_dev);
> > sensor->id = id;
> > sensor->hw = hw;
> > - sensor->odr = st_lsm6dsx_odr_table[id].odr_avl[0].hz;
> > + sensor->odr = hw->settings->odr_table[id].odr_avl[0].hz;
> > sensor->gain = st_lsm6dsx_fs_table[id].fs_avl[0].gain;
> > sensor->watermark = 1;
> >
> >
>
> Makes sense to me, thanks! What tree do you build this against though?
> At least to the current -next tree, this doesn't apply.
>
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
testing branch
Lorenzo
> thanks,
>
> martin
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings
2019-07-15 21:42 ` [PATCH 1/3] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings Lorenzo Bianconi
2019-07-16 6:07 ` Martin Kepplinger
@ 2019-07-16 7:17 ` Martin Kepplinger
2019-07-16 9:13 ` Martin Kepplinger
2 siblings, 0 replies; 14+ messages in thread
From: Martin Kepplinger @ 2019-07-16 7:17 UTC (permalink / raw)
To: Lorenzo Bianconi, jic23; +Cc: lorenzo.bianconi, linux-iio
On 15.07.19 23:42, Lorenzo Bianconi wrote:
> Move sensor odr table in st_lsm6dsx_sensor_settings in order to support
> sensors with different odr maps. This is a preliminary patch to add
> support for LSM9DS1 sensor to st_lsm6dsx driver
>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 196 ++++++++++++++++---
> 2 files changed, 166 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> index af379a5429ed..3a89f3f6e2c7 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> @@ -200,6 +200,7 @@ struct st_lsm6dsx_ext_dev_settings {
> * @wai: Sensor WhoAmI default value.
> * @max_fifo_size: Sensor max fifo length in FIFO words.
> * @id: List of hw id/device name supported by the driver configuration.
> + * @odr_table: Hw sensors odr table (Hz + val).
> * @decimator: List of decimator register info (addr + mask).
> * @batch: List of FIFO batching register info (addr + mask).
> * @fifo_ops: Sensor hw FIFO parameters.
> @@ -213,6 +214,7 @@ struct st_lsm6dsx_settings {
> enum st_lsm6dsx_hw_id hw_id;
> const char *name;
> } id[ST_LSM6DSX_MAX_ID];
> + struct st_lsm6dsx_odr_table_entry odr_table[2];
> struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID];
> struct st_lsm6dsx_reg batch[ST_LSM6DSX_MAX_ID];
> struct st_lsm6dsx_fifo_ops fifo_ops;
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index d8c4417cf4eb..b3c6c9792913 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -69,33 +69,6 @@
> #define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
> #define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
>
> -static const struct st_lsm6dsx_odr_table_entry st_lsm6dsx_odr_table[] = {
> - [ST_LSM6DSX_ID_ACC] = {
> - .reg = {
> - .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 },
> - },
> - [ST_LSM6DSX_ID_GYRO] = {
> - .reg = {
> - .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 },
> - }
> -};
> -
> static const struct st_lsm6dsx_fs_table_entry st_lsm6dsx_fs_table[] = {
> [ST_LSM6DSX_ID_ACC] = {
> .reg = {
> @@ -129,6 +102,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DS3_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -179,6 +178,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DS3H_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -238,6 +263,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DS3TRC_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -291,6 +342,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DSOX_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -359,6 +436,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_ASM330LHH_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -401,6 +504,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DSR_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -563,20 +692,22 @@ static int st_lsm6dsx_set_full_scale(struct st_lsm6dsx_sensor *sensor,
>
> int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr, u8 *val)
> {
> + const struct st_lsm6dsx_odr_table_entry *odr_table;
> int i;
>
> + odr_table = &sensor->hw->settings->odr_table[sensor->id];
> for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++)
> /*
> * ext devices can run at different odr respect to
> * accel sensor
> */
> - if (st_lsm6dsx_odr_table[sensor->id].odr_avl[i].hz >= odr)
> + if (odr_table->odr_avl[i].hz >= odr)
> break;
>
> if (i == ST_LSM6DSX_ODR_LIST_SIZE)
> return -EINVAL;
>
> - *val = st_lsm6dsx_odr_table[sensor->id].odr_avl[i].val;
> + *val = odr_table->odr_avl[i].val;
>
> return 0;
> }
> @@ -641,7 +772,7 @@ static int st_lsm6dsx_set_odr(struct st_lsm6dsx_sensor *sensor, u16 req_odr)
> return err;
> }
>
> - reg = &st_lsm6dsx_odr_table[ref_sensor->id].reg;
> + reg = &hw->settings->odr_table[ref_sensor->id].reg;
> data = ST_LSM6DSX_SHIFT_VAL(val, reg->mask);
> return st_lsm6dsx_update_bits_locked(hw, reg->addr, reg->mask, data);
> }
> @@ -786,11 +917,12 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev,
> {
> 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;
> int i, len = 0;
>
> for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++)
> len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
> - st_lsm6dsx_odr_table[id].odr_avl[i].hz);
> + hw->settings->odr_table[id].odr_avl[i].hz);
> buf[len - 1] = '\n';
>
> return len;
> @@ -1040,7 +1172,7 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,
> sensor = iio_priv(iio_dev);
> sensor->id = id;
> sensor->hw = hw;
> - sensor->odr = st_lsm6dsx_odr_table[id].odr_avl[0].hz;
> + sensor->odr = hw->settings->odr_table[id].odr_avl[0].hz;
> sensor->gain = st_lsm6dsx_fs_table[id].fs_avl[0].gain;
> sensor->watermark = 1;
>
>
Reviewed-by: Martin Kepplinger <martin.kepplinger@puri.sm>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] iio: imu: st_lsm6dsx: move fs_table in st_lsm6dsx_sensor_settings
2019-07-15 21:42 ` [PATCH 2/3] iio: imu: st_lsm6dsx: move fs_table " Lorenzo Bianconi
@ 2019-07-16 7:18 ` Martin Kepplinger
2019-07-16 9:13 ` Martin Kepplinger
1 sibling, 0 replies; 14+ messages in thread
From: Martin Kepplinger @ 2019-07-16 7:18 UTC (permalink / raw)
To: Lorenzo Bianconi, jic23; +Cc: lorenzo.bianconi, linux-iio
On 15.07.19 23:42, Lorenzo Bianconi wrote:
> Move fs_table in st_lsm6dsx_sensor_settings in order to support
> sensors with different gain maps. This is a preliminary patch to add
> support for LSM9DS1 sensor to st_lsm6dsx driver
>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 175 +++++++++++++++----
> 2 files changed, 144 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> index 3a89f3f6e2c7..ab1c66615d67 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> @@ -201,6 +201,7 @@ struct st_lsm6dsx_ext_dev_settings {
> * @max_fifo_size: Sensor max fifo length in FIFO words.
> * @id: List of hw id/device name supported by the driver configuration.
> * @odr_table: Hw sensors odr table (Hz + val).
> + * @fs_table: Hw sensors gain table (gain + val).
> * @decimator: List of decimator register info (addr + mask).
> * @batch: List of FIFO batching register info (addr + mask).
> * @fifo_ops: Sensor hw FIFO parameters.
> @@ -215,6 +216,7 @@ struct st_lsm6dsx_settings {
> const char *name;
> } id[ST_LSM6DSX_MAX_ID];
> struct st_lsm6dsx_odr_table_entry odr_table[2];
> + struct st_lsm6dsx_fs_table_entry fs_table[2];
> struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID];
> struct st_lsm6dsx_reg batch[ST_LSM6DSX_MAX_ID];
> struct st_lsm6dsx_fifo_ops fifo_ops;
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index b3c6c9792913..9aa109428a52 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -69,29 +69,6 @@
> #define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
> #define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
>
> -static const struct st_lsm6dsx_fs_table_entry st_lsm6dsx_fs_table[] = {
> - [ST_LSM6DSX_ID_ACC] = {
> - .reg = {
> - .addr = 0x10,
> - .mask = GENMASK(3, 2),
> - },
> - .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> - .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> - .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> - .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> - },
> - [ST_LSM6DSX_ID_GYRO] = {
> - .reg = {
> - .addr = 0x11,
> - .mask = GENMASK(3, 2),
> - },
> - .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> - .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> - .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> - .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> - }
> -};
> -
> static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> {
> .wai = 0x69,
> @@ -128,6 +105,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .odr_avl[5] = { 416, 0x06 },
> },
> },
> + .fs_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .addr = 0x10,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> + .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> + .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> + .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .addr = 0x11,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> + .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> + .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> + .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -204,6 +203,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .odr_avl[5] = { 416, 0x06 },
> },
> },
> + .fs_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .addr = 0x10,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> + .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> + .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> + .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .addr = 0x11,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> + .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> + .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> + .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -289,6 +310,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .odr_avl[5] = { 416, 0x06 },
> },
> },
> + .fs_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .addr = 0x10,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> + .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> + .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> + .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .addr = 0x11,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> + .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> + .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> + .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -368,6 +411,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .odr_avl[5] = { 416, 0x06 },
> },
> },
> + .fs_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .addr = 0x10,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> + .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> + .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> + .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .addr = 0x11,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> + .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> + .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> + .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -462,6 +527,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .odr_avl[5] = { 416, 0x06 },
> },
> },
> + .fs_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .addr = 0x10,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> + .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> + .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> + .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .addr = 0x11,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> + .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> + .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> + .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -530,6 +617,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .odr_avl[5] = { 416, 0x06 },
> },
> },
> + .fs_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .addr = 0x10,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> + .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> + .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> + .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .addr = 0x11,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> + .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> + .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> + .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -665,23 +774,22 @@ static int st_lsm6dsx_check_whoami(struct st_lsm6dsx_hw *hw, int id,
> static int st_lsm6dsx_set_full_scale(struct st_lsm6dsx_sensor *sensor,
> u32 gain)
> {
> - struct st_lsm6dsx_hw *hw = sensor->hw;
> - const struct st_lsm6dsx_reg *reg;
> + const struct st_lsm6dsx_fs_table_entry *fs_table;
> unsigned int data;
> int i, err;
> - u8 val;
>
> + fs_table = &sensor->hw->settings->fs_table[sensor->id];
> for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++)
> - if (st_lsm6dsx_fs_table[sensor->id].fs_avl[i].gain == gain)
> + if (fs_table->fs_avl[i].gain == gain)
> break;
>
> if (i == ST_LSM6DSX_FS_LIST_SIZE)
> return -EINVAL;
>
> - val = st_lsm6dsx_fs_table[sensor->id].fs_avl[i].val;
> - reg = &st_lsm6dsx_fs_table[sensor->id].reg;
> - data = ST_LSM6DSX_SHIFT_VAL(val, reg->mask);
> - err = st_lsm6dsx_update_bits_locked(hw, reg->addr, reg->mask, data);
> + data = ST_LSM6DSX_SHIFT_VAL(fs_table->fs_avl[i].val,
> + fs_table->reg.mask);
> + err = st_lsm6dsx_update_bits_locked(sensor->hw, fs_table->reg.addr,
> + fs_table->reg.mask, data);
> if (err < 0)
> return err;
>
> @@ -934,11 +1042,12 @@ static ssize_t st_lsm6dsx_sysfs_scale_avail(struct device *dev,
> {
> 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;
> int i, len = 0;
>
> for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++)
> len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
> - st_lsm6dsx_fs_table[id].fs_avl[i].gain);
> + hw->settings->fs_table[id].fs_avl[i].gain);
> buf[len - 1] = '\n';
>
> return len;
> @@ -1173,7 +1282,7 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,
> sensor->id = id;
> sensor->hw = hw;
> sensor->odr = hw->settings->odr_table[id].odr_avl[0].hz;
> - sensor->gain = st_lsm6dsx_fs_table[id].fs_avl[0].gain;
> + sensor->gain = hw->settings->fs_table[id].fs_avl[0].gain;
> sensor->watermark = 1;
>
> switch (id) {
>
Reviewed-by: Martin Kepplinger <martin.kepplinger@puri.sm>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings
2019-07-15 21:42 ` [PATCH 1/3] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings Lorenzo Bianconi
2019-07-16 6:07 ` Martin Kepplinger
2019-07-16 7:17 ` Martin Kepplinger
@ 2019-07-16 9:13 ` Martin Kepplinger
2 siblings, 0 replies; 14+ messages in thread
From: Martin Kepplinger @ 2019-07-16 9:13 UTC (permalink / raw)
To: Lorenzo Bianconi, jic23; +Cc: lorenzo.bianconi, linux-iio
On 15.07.19 23:42, Lorenzo Bianconi wrote:
> Move sensor odr table in st_lsm6dsx_sensor_settings in order to support
> sensors with different odr maps. This is a preliminary patch to add
> support for LSM9DS1 sensor to st_lsm6dsx driver
>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 196 ++++++++++++++++---
> 2 files changed, 166 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> index af379a5429ed..3a89f3f6e2c7 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> @@ -200,6 +200,7 @@ struct st_lsm6dsx_ext_dev_settings {
> * @wai: Sensor WhoAmI default value.
> * @max_fifo_size: Sensor max fifo length in FIFO words.
> * @id: List of hw id/device name supported by the driver configuration.
> + * @odr_table: Hw sensors odr table (Hz + val).
> * @decimator: List of decimator register info (addr + mask).
> * @batch: List of FIFO batching register info (addr + mask).
> * @fifo_ops: Sensor hw FIFO parameters.
> @@ -213,6 +214,7 @@ struct st_lsm6dsx_settings {
> enum st_lsm6dsx_hw_id hw_id;
> const char *name;
> } id[ST_LSM6DSX_MAX_ID];
> + struct st_lsm6dsx_odr_table_entry odr_table[2];
> struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID];
> struct st_lsm6dsx_reg batch[ST_LSM6DSX_MAX_ID];
> struct st_lsm6dsx_fifo_ops fifo_ops;
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index d8c4417cf4eb..b3c6c9792913 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -69,33 +69,6 @@
> #define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
> #define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
>
> -static const struct st_lsm6dsx_odr_table_entry st_lsm6dsx_odr_table[] = {
> - [ST_LSM6DSX_ID_ACC] = {
> - .reg = {
> - .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 },
> - },
> - [ST_LSM6DSX_ID_GYRO] = {
> - .reg = {
> - .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 },
> - }
> -};
> -
> static const struct st_lsm6dsx_fs_table_entry st_lsm6dsx_fs_table[] = {
> [ST_LSM6DSX_ID_ACC] = {
> .reg = {
> @@ -129,6 +102,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DS3_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -179,6 +178,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DS3H_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -238,6 +263,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DS3TRC_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -291,6 +342,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DSOX_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -359,6 +436,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_ASM330LHH_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -401,6 +504,32 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .name = ST_LSM6DSR_DEV_NAME,
> },
> },
> + .odr_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .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 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .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 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -563,20 +692,22 @@ static int st_lsm6dsx_set_full_scale(struct st_lsm6dsx_sensor *sensor,
>
> int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr, u8 *val)
> {
> + const struct st_lsm6dsx_odr_table_entry *odr_table;
> int i;
>
> + odr_table = &sensor->hw->settings->odr_table[sensor->id];
> for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++)
> /*
> * ext devices can run at different odr respect to
> * accel sensor
> */
> - if (st_lsm6dsx_odr_table[sensor->id].odr_avl[i].hz >= odr)
> + if (odr_table->odr_avl[i].hz >= odr)
> break;
>
> if (i == ST_LSM6DSX_ODR_LIST_SIZE)
> return -EINVAL;
>
> - *val = st_lsm6dsx_odr_table[sensor->id].odr_avl[i].val;
> + *val = odr_table->odr_avl[i].val;
>
> return 0;
> }
> @@ -641,7 +772,7 @@ static int st_lsm6dsx_set_odr(struct st_lsm6dsx_sensor *sensor, u16 req_odr)
> return err;
> }
>
> - reg = &st_lsm6dsx_odr_table[ref_sensor->id].reg;
> + reg = &hw->settings->odr_table[ref_sensor->id].reg;
> data = ST_LSM6DSX_SHIFT_VAL(val, reg->mask);
> return st_lsm6dsx_update_bits_locked(hw, reg->addr, reg->mask, data);
> }
> @@ -786,11 +917,12 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev,
> {
> 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;
> int i, len = 0;
>
> for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++)
> len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
> - st_lsm6dsx_odr_table[id].odr_avl[i].hz);
> + hw->settings->odr_table[id].odr_avl[i].hz);
> buf[len - 1] = '\n';
>
> return len;
> @@ -1040,7 +1172,7 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,
> sensor = iio_priv(iio_dev);
> sensor->id = id;
> sensor->hw = hw;
> - sensor->odr = st_lsm6dsx_odr_table[id].odr_avl[0].hz;
> + sensor->odr = hw->settings->odr_table[id].odr_avl[0].hz;
> sensor->gain = st_lsm6dsx_fs_table[id].fs_avl[0].gain;
> sensor->watermark = 1;
>
>
Tested-by: Martin Kepplinger <martin.kepplinger@puri.sm>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] iio: imu: st_lsm6dsx: move fs_table in st_lsm6dsx_sensor_settings
2019-07-15 21:42 ` [PATCH 2/3] iio: imu: st_lsm6dsx: move fs_table " Lorenzo Bianconi
2019-07-16 7:18 ` Martin Kepplinger
@ 2019-07-16 9:13 ` Martin Kepplinger
1 sibling, 0 replies; 14+ messages in thread
From: Martin Kepplinger @ 2019-07-16 9:13 UTC (permalink / raw)
To: Lorenzo Bianconi, jic23; +Cc: lorenzo.bianconi, linux-iio
On 15.07.19 23:42, Lorenzo Bianconi wrote:
> Move fs_table in st_lsm6dsx_sensor_settings in order to support
> sensors with different gain maps. This is a preliminary patch to add
> support for LSM9DS1 sensor to st_lsm6dsx driver
>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 175 +++++++++++++++----
> 2 files changed, 144 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> index 3a89f3f6e2c7..ab1c66615d67 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> @@ -201,6 +201,7 @@ struct st_lsm6dsx_ext_dev_settings {
> * @max_fifo_size: Sensor max fifo length in FIFO words.
> * @id: List of hw id/device name supported by the driver configuration.
> * @odr_table: Hw sensors odr table (Hz + val).
> + * @fs_table: Hw sensors gain table (gain + val).
> * @decimator: List of decimator register info (addr + mask).
> * @batch: List of FIFO batching register info (addr + mask).
> * @fifo_ops: Sensor hw FIFO parameters.
> @@ -215,6 +216,7 @@ struct st_lsm6dsx_settings {
> const char *name;
> } id[ST_LSM6DSX_MAX_ID];
> struct st_lsm6dsx_odr_table_entry odr_table[2];
> + struct st_lsm6dsx_fs_table_entry fs_table[2];
> struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID];
> struct st_lsm6dsx_reg batch[ST_LSM6DSX_MAX_ID];
> struct st_lsm6dsx_fifo_ops fifo_ops;
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index b3c6c9792913..9aa109428a52 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -69,29 +69,6 @@
> #define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
> #define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
>
> -static const struct st_lsm6dsx_fs_table_entry st_lsm6dsx_fs_table[] = {
> - [ST_LSM6DSX_ID_ACC] = {
> - .reg = {
> - .addr = 0x10,
> - .mask = GENMASK(3, 2),
> - },
> - .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> - .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> - .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> - .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> - },
> - [ST_LSM6DSX_ID_GYRO] = {
> - .reg = {
> - .addr = 0x11,
> - .mask = GENMASK(3, 2),
> - },
> - .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> - .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> - .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> - .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> - }
> -};
> -
> static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> {
> .wai = 0x69,
> @@ -128,6 +105,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .odr_avl[5] = { 416, 0x06 },
> },
> },
> + .fs_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .addr = 0x10,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> + .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> + .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> + .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .addr = 0x11,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> + .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> + .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> + .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -204,6 +203,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .odr_avl[5] = { 416, 0x06 },
> },
> },
> + .fs_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .addr = 0x10,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> + .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> + .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> + .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .addr = 0x11,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> + .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> + .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> + .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -289,6 +310,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .odr_avl[5] = { 416, 0x06 },
> },
> },
> + .fs_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .addr = 0x10,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> + .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> + .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> + .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .addr = 0x11,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> + .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> + .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> + .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + },
> + },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x08,
> @@ -368,6 +411,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .odr_avl[5] = { 416, 0x06 },
> },
> },
> + .fs_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .addr = 0x10,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> + .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> + .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> + .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .addr = 0x11,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> + .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> + .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> + .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -462,6 +527,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .odr_avl[5] = { 416, 0x06 },
> },
> },
> + .fs_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .addr = 0x10,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> + .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> + .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> + .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .addr = 0x11,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> + .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> + .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> + .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -530,6 +617,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .odr_avl[5] = { 416, 0x06 },
> },
> },
> + .fs_table = {
> + [ST_LSM6DSX_ID_ACC] = {
> + .reg = {
> + .addr = 0x10,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_G_TO_M_S_2(61), 0x0 },
> + .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> + .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> + .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + },
> + [ST_LSM6DSX_ID_GYRO] = {
> + .reg = {
> + .addr = 0x11,
> + .mask = GENMASK(3, 2),
> + },
> + .fs_avl[0] = { IIO_DEGREE_TO_RAD(8750), 0x0 },
> + .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> + .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> + .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + },
> + },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> .addr = 0x09,
> @@ -665,23 +774,22 @@ static int st_lsm6dsx_check_whoami(struct st_lsm6dsx_hw *hw, int id,
> static int st_lsm6dsx_set_full_scale(struct st_lsm6dsx_sensor *sensor,
> u32 gain)
> {
> - struct st_lsm6dsx_hw *hw = sensor->hw;
> - const struct st_lsm6dsx_reg *reg;
> + const struct st_lsm6dsx_fs_table_entry *fs_table;
> unsigned int data;
> int i, err;
> - u8 val;
>
> + fs_table = &sensor->hw->settings->fs_table[sensor->id];
> for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++)
> - if (st_lsm6dsx_fs_table[sensor->id].fs_avl[i].gain == gain)
> + if (fs_table->fs_avl[i].gain == gain)
> break;
>
> if (i == ST_LSM6DSX_FS_LIST_SIZE)
> return -EINVAL;
>
> - val = st_lsm6dsx_fs_table[sensor->id].fs_avl[i].val;
> - reg = &st_lsm6dsx_fs_table[sensor->id].reg;
> - data = ST_LSM6DSX_SHIFT_VAL(val, reg->mask);
> - err = st_lsm6dsx_update_bits_locked(hw, reg->addr, reg->mask, data);
> + data = ST_LSM6DSX_SHIFT_VAL(fs_table->fs_avl[i].val,
> + fs_table->reg.mask);
> + err = st_lsm6dsx_update_bits_locked(sensor->hw, fs_table->reg.addr,
> + fs_table->reg.mask, data);
> if (err < 0)
> return err;
>
> @@ -934,11 +1042,12 @@ static ssize_t st_lsm6dsx_sysfs_scale_avail(struct device *dev,
> {
> 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;
> int i, len = 0;
>
> for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++)
> len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
> - st_lsm6dsx_fs_table[id].fs_avl[i].gain);
> + hw->settings->fs_table[id].fs_avl[i].gain);
> buf[len - 1] = '\n';
>
> return len;
> @@ -1173,7 +1282,7 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,
> sensor->id = id;
> sensor->hw = hw;
> sensor->odr = hw->settings->odr_table[id].odr_avl[0].hz;
> - sensor->gain = st_lsm6dsx_fs_table[id].fs_avl[0].gain;
> + sensor->gain = hw->settings->fs_table[id].fs_avl[0].gain;
> sensor->watermark = 1;
>
> switch (id) {
>
Tested-by: Martin Kepplinger <martin.kepplinger@puri.sm>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/3] st_lsm6dsx: move {odr,fs}_table in
2019-07-15 21:42 [PATCH 0/3] st_lsm6dsx: move {odr,fs}_table in Lorenzo Bianconi
` (2 preceding siblings ...)
2019-07-15 21:42 ` [PATCH 3/3] iio: imu: st_lsm6dsx: inline acc/gyro output regs Lorenzo Bianconi
@ 2019-07-23 5:41 ` Martin Kepplinger
2019-07-25 5:37 ` Martin Kepplinger
3 siblings, 1 reply; 14+ messages in thread
From: Martin Kepplinger @ 2019-07-23 5:41 UTC (permalink / raw)
To: Lorenzo Bianconi, jic23; +Cc: lorenzo.bianconi, linux-iio, martin.kepplinger
On 15.07.19 23:42, Lorenzo Bianconi wrote:
> Move odr and gain table in st_lsm6dsx_sensor_settings maps in order to support
> devices with different odr/fs definitions. This is a preliminary series to add
> support for LSM9DS1
>
> Lorenzo Bianconi (3):
> iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings
> iio: imu: st_lsm6dsx: move fs_table in st_lsm6dsx_sensor_settings
> iio: imu: st_lsm6dsx: inline acc/gyro output regs
>
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 4 +
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 397 +++++++++++++++----
> 2 files changed, 316 insertions(+), 85 deletions(-)
>
Lorenzo, maybe you should resend this and add LKML and some more
relevant people to CC. Any other objections on this?
thanks,
martin
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/3] st_lsm6dsx: move {odr,fs}_table in
2019-07-23 5:41 ` [PATCH 0/3] st_lsm6dsx: move {odr,fs}_table in Martin Kepplinger
@ 2019-07-25 5:37 ` Martin Kepplinger
0 siblings, 0 replies; 14+ messages in thread
From: Martin Kepplinger @ 2019-07-25 5:37 UTC (permalink / raw)
To: Martin Kepplinger, Lorenzo Bianconi, jic23; +Cc: lorenzo.bianconi, linux-iio
On 23.07.19 07:41, Martin Kepplinger wrote:
> On 15.07.19 23:42, Lorenzo Bianconi wrote:
>> Move odr and gain table in st_lsm6dsx_sensor_settings maps in order to support
>> devices with different odr/fs definitions. This is a preliminary series to add
>> support for LSM9DS1
>>
>> Lorenzo Bianconi (3):
>> iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings
>> iio: imu: st_lsm6dsx: move fs_table in st_lsm6dsx_sensor_settings
>> iio: imu: st_lsm6dsx: inline acc/gyro output regs
>>
>> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 4 +
>> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 397 +++++++++++++++----
>> 2 files changed, 316 insertions(+), 85 deletions(-)
>>
>
> Lorenzo, maybe you should resend this and add LKML and some more
> relevant people to CC. Any other objections on this?
>
> thanks,
>
> martin
>
resent as part of "Add support for ..." patchset:
https://lore.kernel.org/linux-iio/20190725053132.9589-1-martin.kepplinger@puri.sm/
I hope that's ok for you, Lorenzo.
martin
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-07-25 5:37 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-15 21:42 [PATCH 0/3] st_lsm6dsx: move {odr,fs}_table in Lorenzo Bianconi
2019-07-15 21:42 ` [PATCH 1/3] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings Lorenzo Bianconi
2019-07-16 6:07 ` Martin Kepplinger
2019-07-16 6:25 ` Lorenzo Bianconi
2019-07-16 7:17 ` Martin Kepplinger
2019-07-16 9:13 ` Martin Kepplinger
2019-07-15 21:42 ` [PATCH 2/3] iio: imu: st_lsm6dsx: move fs_table " Lorenzo Bianconi
2019-07-16 7:18 ` Martin Kepplinger
2019-07-16 9:13 ` Martin Kepplinger
2019-07-15 21:42 ` [PATCH 3/3] iio: imu: st_lsm6dsx: inline acc/gyro output regs Lorenzo Bianconi
2019-07-16 6:04 ` Martin Kepplinger
2019-07-16 6:24 ` Lorenzo Bianconi
2019-07-23 5:41 ` [PATCH 0/3] st_lsm6dsx: move {odr,fs}_table in Martin Kepplinger
2019-07-25 5:37 ` Martin Kepplinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).