Commit 4393e4c5 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jonathan Cameron
Browse files

iio: imu: st_lsm6dsx: add support to LSM6DST 

Add support to STM LSM6DST (acc + gyro) Mems sensor
https://www.st.com/resource/en/datasheet/lsm6dst.pdf



Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://lore.kernel.org/r/835127b76ef5ad05aa2aac58298aee5f3073fb71.1601985763.git.lorenzo@kernel.org


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 5483b8d5

drivers/iio/imu/st_lsm6dsx/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 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, lsm6dsrx, lsm6ds0 and the accelerometer/gyroscope

	  of lsm9ds1.

	  ism330dhcx, lsm6dsrx, lsm6ds0, the accelerometer/gyroscope

	  of lsm9ds1 and lsm6dst.



	  To compile this driver as a module, choose M here: the module

	  will be called st_lsm6dsx.

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#define ST_LSM9DS1_DEV_NAME	"lsm9ds1-imu"

#define ST_LSM6DS0_DEV_NAME	"lsm6ds0"

#define ST_LSM6DSRX_DEV_NAME	"lsm6dsrx"

#define ST_LSM6DST_DEV_NAME	"lsm6dst"



enum st_lsm6dsx_hw_id {

	ST_LSM6DS3_ID,
@@ -44,6 +45,7 @@ enum st_lsm6dsx_hw_id { 
	ST_LSM9DS1_ID,

	ST_LSM6DS0_ID,

	ST_LSM6DSRX_ID,

	ST_LSM6DST_ID,

	ST_LSM6DSX_MAX_ID,

};

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,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/LSM6DSOX/ASM330LHH/LSM6DSR/LSM6DSRX/ISM330DHCX:

 * LSM6DSO/LSM6DSOX/ASM330LHH/LSM6DSR/LSM6DSRX/ISM330DHCX/LSM6DST:

 * 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).

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c

+206 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
 *   - Gyroscope supported full-scale [dps]: +-125/+-245/+-500/+-1000/+-2000

 *   - FIFO size: 4KB

 *

 * - LSM6DSO/LSM6DSOX/ASM330LHH/LSM6DSR/ISM330DHCX:

 * - LSM6DSO/LSM6DSOX/ASM330LHH/LSM6DSR/ISM330DHCX/LSM6DST:

 *   - Accelerometer/Gyroscope supported ODR [Hz]: 13, 26, 52, 104, 208, 416,

 *     833

 *   - Accelerometer supported full-scale [g]: +-2/+-4/+-8/+-16
@@ -1334,6 +1334,211 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { 
			.wakeup_src_x_mask = BIT(2),

		}

	},

	{

		.wai = 0x6d,

		.reset = {

			.addr = 0x12,

			.mask = BIT(0),

		},

		.boot = {

			.addr = 0x12,

			.mask = BIT(7),

		},

		.bdu = {

			.addr = 0x12,

			.mask = BIT(6),

		},

		.max_fifo_size = 512,

		.id = {

			{

				.hw_id = ST_LSM6DST_ID,

				.name = ST_LSM6DST_DEV_NAME,

			},

		},

		.channels = {

			[ST_LSM6DSX_ID_ACC] = {

				.chan = st_lsm6dsx_acc_channels,

				.len = ARRAY_SIZE(st_lsm6dsx_acc_channels),

			},

			[ST_LSM6DSX_ID_GYRO] = {

				.chan = st_lsm6dsx_gyro_channels,

				.len = ARRAY_SIZE(st_lsm6dsx_gyro_channels),

			},

		},

		.drdy_mask = {

			.addr = 0x13,

			.mask = BIT(3),

		},

		.odr_table = {

			[ST_LSM6DSX_ID_ACC] = {

				.reg = {

					.addr = 0x10,

					.mask = GENMASK(7, 4),

				},

				.odr_avl[0] = {  12500, 0x01 },

				.odr_avl[1] = {  26000, 0x02 },

				.odr_avl[2] = {  52000, 0x03 },

				.odr_avl[3] = { 104000, 0x04 },

				.odr_avl[4] = { 208000, 0x05 },

				.odr_avl[5] = { 416000, 0x06 },

				.odr_avl[6] = { 833000, 0x07 },

				.odr_len = 7,

			},

			[ST_LSM6DSX_ID_GYRO] = {

				.reg = {

					.addr = 0x11,

					.mask = GENMASK(7, 4),

				},

				.odr_avl[0] = {  12500, 0x01 },

				.odr_avl[1] = {  26000, 0x02 },

				.odr_avl[2] = {  52000, 0x03 },

				.odr_avl[3] = { 104000, 0x04 },

				.odr_avl[4] = { 208000, 0x05 },

				.odr_avl[5] = { 416000, 0x06 },

				.odr_avl[6] = { 833000, 0x07 },

				.odr_len = 7,

			},

		},

		.fs_table = {

			[ST_LSM6DSX_ID_ACC] = {

				.reg = {

					.addr = 0x10,

					.mask = GENMASK(3, 2),

				},

				.fs_avl[0] = {  IIO_G_TO_M_S_2(61000), 0x0 },

				.fs_avl[1] = { IIO_G_TO_M_S_2(122000), 0x2 },

				.fs_avl[2] = { IIO_G_TO_M_S_2(244000), 0x3 },

				.fs_avl[3] = { IIO_G_TO_M_S_2(488000), 0x1 },

				.fs_len = 4,

			},

			[ST_LSM6DSX_ID_GYRO] = {

				.reg = {

					.addr = 0x11,

					.mask = GENMASK(3, 2),

				},

				.fs_avl[0] = {  IIO_DEGREE_TO_RAD(8750000), 0x0 },

				.fs_avl[1] = { IIO_DEGREE_TO_RAD(17500000), 0x1 },

				.fs_avl[2] = { IIO_DEGREE_TO_RAD(35000000), 0x2 },

				.fs_avl[3] = { IIO_DEGREE_TO_RAD(70000000), 0x3 },

				.fs_len = 4,

			},

		},

		.irq_config = {

			.irq1 = {

				.addr = 0x0d,

				.mask = BIT(3),

			},

			.irq2 = {

				.addr = 0x0e,

				.mask = BIT(3),

			},

			.lir = {

				.addr = 0x56,

				.mask = BIT(0),

			},

			.clear_on_read = {

				.addr = 0x56,

				.mask = BIT(6),

			},

			.irq1_func = {

				.addr = 0x5e,

				.mask = BIT(5),

			},

			.irq2_func = {

				.addr = 0x5f,

				.mask = BIT(5),

			},

			.hla = {

				.addr = 0x12,

				.mask = BIT(5),

			},

			.od = {

				.addr = 0x12,

				.mask = BIT(4),

			},

		},

		.batch = {

			[ST_LSM6DSX_ID_ACC] = {

				.addr = 0x09,

				.mask = GENMASK(3, 0),

			},

			[ST_LSM6DSX_ID_GYRO] = {

				.addr = 0x09,

				.mask = GENMASK(7, 4),

			},

		},

		.fifo_ops = {

			.update_fifo = st_lsm6dsx_update_fifo,

			.read_fifo = st_lsm6dsx_read_tagged_fifo,

			.fifo_th = {

				.addr = 0x07,

				.mask = GENMASK(8, 0),

			},

			.fifo_diff = {

				.addr = 0x3a,

				.mask = GENMASK(9, 0),

			},

			.th_wl = 1,

		},

		.ts_settings = {

			.timer_en = {

				.addr = 0x19,

				.mask = BIT(5),

			},

			.decimator = {

				.addr = 0x0a,

				.mask = GENMASK(7, 6),

			},

			.freq_fine = 0x63,

		},

		.shub_settings = {

			.page_mux = {

				.addr = 0x01,

				.mask = BIT(6),

			},

			.master_en = {

				.sec_page = true,

				.addr = 0x14,

				.mask = BIT(2),

			},

			.pullup_en = {

				.sec_page = true,

				.addr = 0x14,

				.mask = BIT(3),

			},

			.aux_sens = {

				.addr = 0x14,

				.mask = GENMASK(1, 0),

			},

			.wr_once = {

				.addr = 0x14,

				.mask = BIT(6),

			},

			.num_ext_dev = 3,

			.shub_out = {

				.sec_page = true,

				.addr = 0x02,

			},

			.slv0_addr = 0x15,

			.dw_slv0_addr = 0x21,

			.batch_en = BIT(3),

		},

		.event_settings = {

			.enable_reg = {

				.addr = 0x58,

				.mask = BIT(7),

			},

			.wakeup_reg = {

				.addr = 0x5b,

				.mask = GENMASK(5, 0),

			},

			.wakeup_src_reg = 0x1b,

			.wakeup_src_status_mask = BIT(3),

			.wakeup_src_z_mask = BIT(0),

			.wakeup_src_y_mask = BIT(1),

			.wakeup_src_x_mask = BIT(2),

		},

	},

};



int st_lsm6dsx_set_page(struct st_lsm6dsx_hw *hw, bool enable)

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c

+5 −0
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ static const struct of_device_id st_lsm6dsx_i2c_of_match[] = { 
		.compatible = "st,lsm6dsrx",

		.data = (void *)ST_LSM6DSRX_ID,

	},

	{

		.compatible = "st,lsm6dst",

		.data = (void *)ST_LSM6DST_ID,

	},

	{},

};

MODULE_DEVICE_TABLE(of, st_lsm6dsx_i2c_of_match);
@@ -113,6 +117,7 @@ static const struct i2c_device_id st_lsm6dsx_i2c_id_table[] = { 
	{ ST_LSM9DS1_DEV_NAME, ST_LSM9DS1_ID },

	{ ST_LSM6DS0_DEV_NAME, ST_LSM6DS0_ID },

	{ ST_LSM6DSRX_DEV_NAME, ST_LSM6DSRX_ID },

	{ ST_LSM6DST_DEV_NAME, ST_LSM6DST_ID },

	{},

};

MODULE_DEVICE_TABLE(i2c, st_lsm6dsx_i2c_id_table);