iio: imu: st_lsm6dsx: move decimator info in st_lsm6dsx_sensor_settings (7ca3ac9e) · Commits · 戴 / test

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h

+8 −2

Original line number	Diff line number	Diff line
		@@ -52,10 +52,18 @@ struct st_lsm6dsx_reg {
		u8 mask;
		};

		/**
		* struct st_lsm6dsx_settings - ST IMU sensor settings
		* @wai: Sensor WhoAmI default value.
		* @max_fifo_size: Sensor max fifo length in FIFO words.
		* @id: List of hw id supported by the driver configuration.
		* @decimator: List of decimator register info (addr + mask).
		*/
		struct st_lsm6dsx_settings {
		u8 wai;
		u16 max_fifo_size;
		enum st_lsm6dsx_hw_id id[ST_LSM6DSX_MAX_ID];
		struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID];
		};

		enum st_lsm6dsx_sensor_id {
		@@ -79,7 +87,6 @@ enum st_lsm6dsx_fifo_mode {
		* @watermark: Sensor watermark level.
		* @sip: Number of samples in a given pattern.
		* @decimator: FIFO decimation factor.
		* @decimator_mask: Sensor mask for decimation register.
		* @delta_ts: Delta time between two consecutive interrupts.
		* @ts: Latest timestamp from the interrupt handler.
		*/
		@@ -94,7 +101,6 @@ struct st_lsm6dsx_sensor {
		u16 watermark;
		u8 sip;
		u8 decimator;
		u8 decimator_mask;

		s64 delta_ts;
		s64 ts;

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@
		#define ST_LSM6DSX_REG_FIFO_THL_ADDR 0x06
		#define ST_LSM6DSX_REG_FIFO_THH_ADDR 0x07
		#define ST_LSM6DSX_FIFO_TH_MASK GENMASK(11, 0)
		#define ST_LSM6DSX_REG_FIFO_DEC_GXL_ADDR 0x08
		#define ST_LSM6DSX_REG_HLACTIVE_ADDR 0x12
		#define ST_LSM6DSX_REG_HLACTIVE_MASK BIT(5)
		#define ST_LSM6DSX_REG_PP_OD_ADDR 0x12
		@@ -110,8 +109,9 @@ static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw)
		st_lsm6dsx_get_max_min_odr(hw, &max_odr, &min_odr);

		for (i = 0; i < ST_LSM6DSX_ID_MAX; i++) {
		sensor = iio_priv(hw->iio_devs[i]);
		const struct st_lsm6dsx_reg *dec_reg;

		sensor = iio_priv(hw->iio_devs[i]);
		/* update fifo decimators and sample in pattern */
		if (hw->enable_mask & BIT(sensor->id)) {
		sensor->sip = sensor->odr / min_odr;
		@@ -123,12 +123,13 @@ static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw)
		data = 0;
		}

		err = st_lsm6dsx_write_with_mask(hw,
		ST_LSM6DSX_REG_FIFO_DEC_GXL_ADDR,
		sensor->decimator_mask, data);
		dec_reg = &hw->settings->decimator[sensor->id];
		if (dec_reg->addr) {
		err = st_lsm6dsx_write_with_mask(hw, dec_reg->addr,
		dec_reg->mask, data);
		if (err < 0)
		return err;

		}
		sip += sensor->sip;
		}
		hw->sip = sip;

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c

+30 −4

Original line number	Diff line number	Diff line
		@@ -42,8 +42,6 @@

		#include "st_lsm6dsx.h"

		#define ST_LSM6DSX_REG_ACC_DEC_MASK GENMASK(2, 0)
		#define ST_LSM6DSX_REG_GYRO_DEC_MASK GENMASK(5, 3)
		#define ST_LSM6DSX_REG_INT1_ADDR 0x0d
		#define ST_LSM6DSX_REG_INT2_ADDR 0x0e
		#define ST_LSM6DSX_REG_FIFO_FTH_IRQ_MASK BIT(3)
		@@ -160,6 +158,16 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
		.id = {
		[0] = ST_LSM6DS3_ID,
		},
		.decimator = {
		[ST_LSM6DSX_ID_ACC] = {
		.addr = 0x08,
		.mask = GENMASK(2, 0),
		},
		[ST_LSM6DSX_ID_GYRO] = {
		.addr = 0x08,
		.mask = GENMASK(5, 3),
		},
		},
		},
		{
		.wai = 0x69,
		@@ -167,6 +175,16 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
		.id = {
		[0] = ST_LSM6DS3H_ID,
		},
		.decimator = {
		[ST_LSM6DSX_ID_ACC] = {
		.addr = 0x08,
		.mask = GENMASK(2, 0),
		},
		[ST_LSM6DSX_ID_GYRO] = {
		.addr = 0x08,
		.mask = GENMASK(5, 3),
		},
		},
		},
		{
		.wai = 0x6a,
		@@ -175,6 +193,16 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
		[0] = ST_LSM6DSL_ID,
		[1] = ST_LSM6DSM_ID,
		},
		.decimator = {
		[ST_LSM6DSX_ID_ACC] = {
		.addr = 0x08,
		.mask = GENMASK(2, 0),
		},
		[ST_LSM6DSX_ID_GYRO] = {
		.addr = 0x08,
		.mask = GENMASK(5, 3),
		},
		},
		},
		};

		@@ -645,7 +673,6 @@ static struct iio_dev st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw hw,
		iio_dev->num_channels = ARRAY_SIZE(st_lsm6dsx_acc_channels);
		iio_dev->info = &st_lsm6dsx_acc_info;

		sensor->decimator_mask = ST_LSM6DSX_REG_ACC_DEC_MASK;
		scnprintf(sensor->name, sizeof(sensor->name), "%s_accel",
		name);
		break;
		@@ -654,7 +681,6 @@ static struct iio_dev st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw hw,
		iio_dev->num_channels = ARRAY_SIZE(st_lsm6dsx_gyro_channels);
		iio_dev->info = &st_lsm6dsx_gyro_info;

		sensor->decimator_mask = ST_LSM6DSX_REG_GYRO_DEC_MASK;
		scnprintf(sensor->name, sizeof(sensor->name), "%s_gyro",
		name);
		break;

Admin message