iio: imu: st_lsm6dsx: add support to LSM6DSOX

Add support to STM LSM6DSOX 6-axis (acc + gyro) Mems sensor
https://www.st.com/resource/en/datasheet/lsm6dsox.pdf

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/imu/st_lsm6dsx/Kconfig b/drivers/iio/imu/st_lsm6dsx/Kconfig
index 36048bf0455ad7fc487e43d110432262a867cd31..8dcf5137b8da20cce74e6f975e2369b8448b904d 100644 (file)
--- a/drivers/iio/imu/st_lsm6dsx/Kconfig
+++ b/drivers/iio/imu/st_lsm6dsx/Kconfig
@@ -9,7 +9,7 @@ config IIO_ST_LSM6DSX
        help
          Say yes here to build support for STMicroelectronics LSM6DSx imu
          sensor. Supported devices: lsm6ds3, lsm6ds3h, lsm6dsl, lsm6dsm,
-         ism330dlc, lsm6dso, asm330lhh
+         ism330dlc, lsm6dso, lsm6dsox, asm330lhh
 
          To compile this driver as a module, choose M here: the module
          will be called st_lsm6dsx.

diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
index de2a0dc3935343f354d44850139fbb72419fa8c9..0a0c56c1701d7c827857e2c90094ae614e8352fa 100644 (file)
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
@@ -21,6 +21,7 @@
 #define ST_ISM330DLC_DEV_NAME  "ism330dlc"
 #define ST_LSM6DSO_DEV_NAME    "lsm6dso"
 #define ST_ASM330LHH_DEV_NAME  "asm330lhh"
+#define ST_LSM6DSOX_DEV_NAME   "lsm6dsox"
 
 enum st_lsm6dsx_hw_id {
        ST_LSM6DS3_ID,
@@ -30,6 +31,7 @@ enum st_lsm6dsx_hw_id {
        ST_ISM330DLC_ID,
        ST_LSM6DSO_ID,
        ST_ASM330LHH_ID,
+       ST_LSM6DSOX_ID,
        ST_LSM6DSX_MAX_ID,
 };
 

diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
index 8f443bdb5b51cd105a655018b02c89b8049be949..2da8c5ff699adca6251fcc302b4805197b759494 100644 (file)
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
@@ -13,7 +13,7 @@
  * (e.g. Gx, Gy, Gz, Ax, Ay, Az), then data are repeated depending on the
  * value of the decimation factor and ODR set for each FIFO data set.
  *
- * LSM6DSO/ASM330LHH: The FIFO buffer can be configured to store data
+ * LSM6DSO/LSM6DSOX/ASM330LHH: The FIFO buffer can be configured to store data
  * from gyroscope and accelerometer. Each sample is queued with a tag (1B)
  * indicating data source (gyroscope, accelerometer, hw timer).
  *
@@ -506,7 +506,7 @@ st_lsm6dsx_push_tagged_data(struct st_lsm6dsx_hw *hw, u8 tag,
 }
 
 /**
- * st_lsm6dsx_read_tagged_fifo() - LSM6DSO/ASM330LHH read FIFO routine
+ * st_lsm6dsx_read_tagged_fifo() - LSM6DSO/LSM6DSOX/ASM330LHH read FIFO routine
  * @hw: Pointer to instance of struct st_lsm6dsx_hw.
  *
  * Read samples from the hw FIFO and push them to IIO buffers.

diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
index 50cab3531b1106c910bcfa698912f570a401722f..c167ae2c21ab154bed1289b98adc1ceaed61e895 100644 (file)
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
@@ -23,7 +23,7 @@
  *   - Gyroscope supported full-scale [dps]: +-125/+-245/+-500/+-1000/+-2000
  *   - FIFO size: 4KB
  *
- * - LSM6DSO/ASM330LHH
+ * - LSM6DSO/LSM6DSOX/ASM330LHH
  *   - Accelerometer/Gyroscope supported ODR [Hz]: 13, 26, 52, 104, 208, 416
  *   - Accelerometer supported full-scale [g]: +-2/+-4/+-8/+-16
  *   - Gyroscope supported full-scale [dps]: +-125/+-245/+-500/+-1000/+-2000
@@ -287,6 +287,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
                .max_fifo_size = 512,
                .id = {
                        [0] = ST_LSM6DSO_ID,
+                       [1] = ST_LSM6DSOX_ID,
                },
                .batch = {
                        [ST_LSM6DSX_ID_ACC] = {

diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
index 00b4b702645a1005432097c6693687f3878e52e1..0bfc66d2d772deafde50de7f84312a9fe7485d9e 100644 (file)
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
@@ -69,6 +69,10 @@ static const struct of_device_id st_lsm6dsx_i2c_of_match[] = {
                .compatible = "st,asm330lhh",
                .data = (void *)ST_ASM330LHH_ID,
        },
+       {
+               .compatible = "st,lsm6dsox",
+               .data = (void *)ST_LSM6DSOX_ID,
+       },
        {},
 };
 MODULE_DEVICE_TABLE(of, st_lsm6dsx_i2c_of_match);
@@ -81,6 +85,7 @@ static const struct i2c_device_id st_lsm6dsx_i2c_id_table[] = {
        { ST_ISM330DLC_DEV_NAME, ST_ISM330DLC_ID },
        { ST_LSM6DSO_DEV_NAME, ST_LSM6DSO_ID },
        { ST_ASM330LHH_DEV_NAME, ST_ASM330LHH_ID },
+       { ST_LSM6DSOX_DEV_NAME, ST_LSM6DSOX_ID },
        {},
 };
 MODULE_DEVICE_TABLE(i2c, st_lsm6dsx_i2c_id_table);

diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c
index 836256c2ac7d4e41f670e6ec3cc61bfec6808acd..9f46d4ce9fc1d47c3a1d5347616da52e7fbcc426 100644 (file)
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c
@@ -69,6 +69,10 @@ static const struct of_device_id st_lsm6dsx_spi_of_match[] = {
                .compatible = "st,asm330lhh",
                .data = (void *)ST_ASM330LHH_ID,
        },
+       {
+               .compatible = "st,lsm6dsox",
+               .data = (void *)ST_LSM6DSOX_ID,
+       },
        {},
 };
 MODULE_DEVICE_TABLE(of, st_lsm6dsx_spi_of_match);
@@ -81,6 +85,7 @@ static const struct spi_device_id st_lsm6dsx_spi_id_table[] = {
        { ST_ISM330DLC_DEV_NAME, ST_ISM330DLC_ID },
        { ST_LSM6DSO_DEV_NAME, ST_LSM6DSO_ID },
        { ST_ASM330LHH_DEV_NAME, ST_ASM330LHH_ID },
+       { ST_LSM6DSOX_DEV_NAME, ST_LSM6DSOX_ID },
        {},
 };
 MODULE_DEVICE_TABLE(spi, st_lsm6dsx_spi_id_table);