Linux-IIO Archive on lore.kernel.org
 help / color / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: Lorenzo Bianconi <lorenzo@kernel.org>
Cc: lorenzo.bianconi@redhat.com, linux-iio@vger.kernel.org,
	martin.kepplinger@puri.sm
Subject: Re: [PATCH v2 2/4] iio: imu: st_lsm6dsx: move fs_table in st_lsm6dsx_sensor_settings
Date: Mon, 5 Aug 2019 15:18:05 +0100
Message-ID: <20190805151805.27ff8f6e@archlinux> (raw)
In-Reply-To: <9f290ea02b9e878c20cc57880d506acf03bf8ff0.1564427804.git.lorenzo@kernel.org>

On Mon, 29 Jul 2019 21:22:29 +0200
Lorenzo Bianconi <lorenzo@kernel.org> 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
> 
> Tested-by: Martin Kepplinger <martin.kepplinger@puri.sm>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Applied,

Thanks,

Jonathan

> ---
>  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) {


  reply index

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-29 19:22 [PATCH v2 0/4] st_lsm6dsx: move {odr,fs}_table in Lorenzo Bianconi
2019-07-29 19:22 ` [PATCH v2 1/4] iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings Lorenzo Bianconi
2019-08-05 14:17   ` Jonathan Cameron
2019-07-29 19:22 ` [PATCH v2 2/4] iio: imu: st_lsm6dsx: move fs_table " Lorenzo Bianconi
2019-08-05 14:18   ` Jonathan Cameron [this message]
2019-07-29 19:22 ` [PATCH v2 3/4] iio: imu: st_lsm6dsx: inline output acc/gyro output regs Lorenzo Bianconi
2019-08-02  5:35   ` Martin Kepplinger
2019-08-05 14:18     ` Jonathan Cameron
2019-07-29 19:22 ` [PATCH v2 4/4] iio: imu: st_lsm6dsx: move iio chan definitions in st_lsm6dsx_sensor_settings Lorenzo Bianconi
2019-08-02  5:36   ` Martin Kepplinger
2019-08-05 14:19     ` Jonathan Cameron

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190805151805.27ff8f6e@archlinux \
    --to=jic23@kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=lorenzo.bianconi@redhat.com \
    --cc=lorenzo@kernel.org \
    --cc=martin.kepplinger@puri.sm \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-IIO Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-iio/0 linux-iio/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-iio linux-iio/ https://lore.kernel.org/linux-iio \
		linux-iio@vger.kernel.org linux-iio@archiver.kernel.org
	public-inbox-index linux-iio


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-iio


AGPL code for this site: git clone https://public-inbox.org/ public-inbox