On Mon, 7 Oct 2019 11:43:37 +0200
Lorenzo Bianconi <lorenzo@xxxxxxxxxx> wrote:
> Add support to STM LSM6DS0 6-axis (acc + gyro) Mems sensor
>
> Signed-off-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.
Thanks,
Jonathan
> ---
> drivers/iio/imu/st_lsm6dsx/Kconfig | 2 +-
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 ++
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 5 ++++-
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 +++++
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 +++++
> 5 files changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/Kconfig b/drivers/iio/imu/st_lsm6dsx/Kconfig
> index 77aa0e77212d..b425a356d99e 100644
> --- a/drivers/iio/imu/st_lsm6dsx/Kconfig
> +++ b/drivers/iio/imu/st_lsm6dsx/Kconfig
> @@ -12,7 +12,7 @@ config IIO_ST_LSM6DSX
> Say yes here to build support for STMicroelectronics LSM6DSx imu
> sensor. Supported devices: lsm6ds3, lsm6ds3h, lsm6dsl, lsm6dsm,
> ism330dlc, lsm6dso, lsm6dsox, asm330lhh, lsm6dsr, lsm6ds3tr-c,
> - ism330dhcx and the accelerometer/gyroscope of lsm9ds1.
> + ism330dhcx, lsm6ds0 and the accelerometer/gyroscope of lsm9ds1.
>
> 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 40532f99ba4b..74854230aecf 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> @@ -26,6 +26,7 @@
> #define ST_LSM6DS3TRC_DEV_NAME "lsm6ds3tr-c"
> #define ST_ISM330DHCX_DEV_NAME "ism330dhcx"
> #define ST_LSM9DS1_DEV_NAME "lsm9ds1-imu"
> +#define ST_LSM6DS0_DEV_NAME "lsm6ds0"
>
> enum st_lsm6dsx_hw_id {
> ST_LSM6DS3_ID,
> @@ -40,6 +41,7 @@ enum st_lsm6dsx_hw_id {
> ST_LSM6DS3TRC_ID,
> ST_ISM330DHCX_ID,
> ST_LSM9DS1_ID,
> + ST_LSM6DS0_ID,
> ST_LSM6DSX_MAX_ID,
> };
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index e8c3922f1b59..bacc908cf396 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -32,7 +32,7 @@
> * - Gyroscope supported full-scale [dps]: +-125/+-245/+-500/+-1000/+-2000
> * - FIFO size: 3KB
> *
> - * - LSM9DS1:
> + * - LSM9DS1/LSM6DS0:
> * - Accelerometer supported ODR [Hz]: 10, 50, 119, 238, 476, 952
> * - Accelerometer supported full-scale [g]: +-2/+-4/+-8/+-16
> * - Gyroscope supported ODR [Hz]: 15, 60, 119, 238, 476, 952
> @@ -104,6 +104,9 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> {
> .hw_id = ST_LSM9DS1_ID,
> .name = ST_LSM9DS1_DEV_NAME,
> + }, {
> + .hw_id = ST_LSM6DS0_ID,
> + .name = ST_LSM6DS0_DEV_NAME,
> },
> },
> .channels = {
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
> index f52511059545..e57744affbd0 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
> @@ -87,6 +87,10 @@ static const struct of_device_id st_lsm6dsx_i2c_of_match[] = {
> .compatible = "st,lsm9ds1-imu",
> .data = (void *)ST_LSM9DS1_ID,
> },
> + {
> + .compatible = "st,lsm6ds0",
> + .data = (void *)ST_LSM6DS0_ID,
> + },
> {},
> };
> MODULE_DEVICE_TABLE(of, st_lsm6dsx_i2c_of_match);
> @@ -104,6 +108,7 @@ static const struct i2c_device_id st_lsm6dsx_i2c_id_table[] = {
> { ST_LSM6DS3TRC_DEV_NAME, ST_LSM6DS3TRC_ID },
> { ST_ISM330DHCX_DEV_NAME, ST_ISM330DHCX_ID },
> { ST_LSM9DS1_DEV_NAME, ST_LSM9DS1_ID },
> + { ST_LSM6DS0_DEV_NAME, ST_LSM6DS0_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 344b28dddebb..933d4f9f6a4a 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c
> @@ -87,6 +87,10 @@ static const struct of_device_id st_lsm6dsx_spi_of_match[] = {
> .compatible = "st,lsm9ds1-imu",
> .data = (void *)ST_LSM9DS1_ID,
> },
> + {
> + .compatible = "st,lsm6ds0",
> + .data = (void *)ST_LSM6DS0_ID,
> + },
> {},
> };
> MODULE_DEVICE_TABLE(of, st_lsm6dsx_spi_of_match);
> @@ -104,6 +108,7 @@ static const struct spi_device_id st_lsm6dsx_spi_id_table[] = {
> { ST_LSM6DS3TRC_DEV_NAME, ST_LSM6DS3TRC_ID },
> { ST_ISM330DHCX_DEV_NAME, ST_ISM330DHCX_ID },
> { ST_LSM9DS1_DEV_NAME, ST_LSM9DS1_ID },
> + { ST_LSM6DS0_DEV_NAME, ST_LSM6DS0_ID },
> {},
> };
> MODULE_DEVICE_TABLE(spi, st_lsm6dsx_spi_id_table);
