iio: imu: st_lsm6dsx: configure full scale on slave device if supported
diff mbox series

Message ID cb3059b1ef8a5f0ebbd68a11db9931d6a2e4f44d.1584651650.git.lorenzo@kernel.org
State New
Headers show
Series
  • iio: imu: st_lsm6dsx: configure full scale on slave device if supported
Related show

Commit Message

Lorenzo Bianconi March 19, 2020, 9:02 p.m. UTC
Introduce st_lsm6dsx_shub_set_full_scale routine in order to configure
the i2c slave device sensitivity

Tested-by: Jimmy Assarsson <jimmyassarsson@gmail.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)

Comments

Jonathan Cameron April 4, 2020, 2:24 p.m. UTC | #1
On Thu, 19 Mar 2020 22:02:45 +0100
Lorenzo Bianconi <lorenzo@kernel.org> wrote:

> Introduce st_lsm6dsx_shub_set_full_scale routine in order to configure
> the i2c slave device sensitivity
> 
> Tested-by: Jimmy Assarsson <jimmyassarsson@gmail.com>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
I've lost track of what is going on around this driver.
One thing is clear though, this doesn't currently apply to my togreg
tree.  I'll assume that's because I'm missing something (maybe a fix,
or maybe another series).

Give me a poke if I seem to have lost this in a few weeks once all the
trees catch up properly after the merge window.

Thanks,

Jonathan

> ---
>  drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 33 ++++++++++++++++++++
>  1 file changed, 33 insertions(+)
> 
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> index 64ef07a30726..fec1dbd5f00d 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> @@ -518,6 +518,36 @@ st_lsm6dsx_shub_read_raw(struct iio_dev *iio_dev,
>  	return ret;
>  }
>  
> +static int
> +st_lsm6dsx_shub_set_full_scale(struct st_lsm6dsx_sensor *sensor,
> +			       u32 gain)
> +{
> +	const struct st_lsm6dsx_fs_table_entry *fs_table;
> +	int i, err;
> +
> +	fs_table = &sensor->ext_info.settings->fs_table;
> +	if (!fs_table->reg.addr)
> +		return -ENOTSUPP;
> +
> +	for (i = 0; i < fs_table->fs_len; i++) {
> +		if (fs_table->fs_avl[i].gain == gain)
> +			break;
> +	}
> +
> +	if (i == fs_table->fs_len)
> +		return -EINVAL;
> +
> +	err = st_lsm6dsx_shub_write_with_mask(sensor, fs_table->reg.addr,
> +					      fs_table->reg.mask,
> +					      fs_table->fs_avl[i].val);
> +	if (err < 0)
> +		return err;
> +
> +	sensor->gain = gain;
> +
> +	return 0;
> +}
> +
>  static int
>  st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev,
>  			  struct iio_chan_spec const *chan,
> @@ -552,6 +582,9 @@ st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev,
>  		}
>  		break;
>  	}
> +	case IIO_CHAN_INFO_SCALE:
> +		err = st_lsm6dsx_shub_set_full_scale(sensor, val2);
> +		break;
>  	default:
>  		err = -EINVAL;
>  		break;
Lorenzo Bianconi April 4, 2020, 2:31 p.m. UTC | #2
> On Thu, 19 Mar 2020 22:02:45 +0100
> Lorenzo Bianconi <lorenzo@kernel.org> wrote:
> 
> > Introduce st_lsm6dsx_shub_set_full_scale routine in order to configure
> > the i2c slave device sensitivity
> > 
> > Tested-by: Jimmy Assarsson <jimmyassarsson@gmail.com>
> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> I've lost track of what is going on around this driver.
> One thing is clear though, this doesn't currently apply to my togreg
> tree.  I'll assume that's because I'm missing something (maybe a fix,
> or maybe another series).
> 
> Give me a poke if I seem to have lost this in a few weeks once all the
> trees catch up properly after the merge window.
> 
> Thanks,
> 
> Jonathan

Hi Jonathan,

since this is not a fix but a new feature, does it apply to your testing tree?
Anyway I guess this patch is important when you apply LIS3MDL support to sensor
hub driver.
https://patchwork.kernel.org/patch/11463761/

Regards,
Lorenzo

> 
> > ---
> >  drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 33 ++++++++++++++++++++
> >  1 file changed, 33 insertions(+)
> > 
> > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> > index 64ef07a30726..fec1dbd5f00d 100644
> > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> > @@ -518,6 +518,36 @@ st_lsm6dsx_shub_read_raw(struct iio_dev *iio_dev,
> >  	return ret;
> >  }
> >  
> > +static int
> > +st_lsm6dsx_shub_set_full_scale(struct st_lsm6dsx_sensor *sensor,
> > +			       u32 gain)
> > +{
> > +	const struct st_lsm6dsx_fs_table_entry *fs_table;
> > +	int i, err;
> > +
> > +	fs_table = &sensor->ext_info.settings->fs_table;
> > +	if (!fs_table->reg.addr)
> > +		return -ENOTSUPP;
> > +
> > +	for (i = 0; i < fs_table->fs_len; i++) {
> > +		if (fs_table->fs_avl[i].gain == gain)
> > +			break;
> > +	}
> > +
> > +	if (i == fs_table->fs_len)
> > +		return -EINVAL;
> > +
> > +	err = st_lsm6dsx_shub_write_with_mask(sensor, fs_table->reg.addr,
> > +					      fs_table->reg.mask,
> > +					      fs_table->fs_avl[i].val);
> > +	if (err < 0)
> > +		return err;
> > +
> > +	sensor->gain = gain;
> > +
> > +	return 0;
> > +}
> > +
> >  static int
> >  st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev,
> >  			  struct iio_chan_spec const *chan,
> > @@ -552,6 +582,9 @@ st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev,
> >  		}
> >  		break;
> >  	}
> > +	case IIO_CHAN_INFO_SCALE:
> > +		err = st_lsm6dsx_shub_set_full_scale(sensor, val2);
> > +		break;
> >  	default:
> >  		err = -EINVAL;
> >  		break;
>
Jonathan Cameron April 4, 2020, 2:51 p.m. UTC | #3
On Sat, 4 Apr 2020 16:31:18 +0200
Lorenzo Bianconi <lorenzo@kernel.org> wrote:

> > On Thu, 19 Mar 2020 22:02:45 +0100
> > Lorenzo Bianconi <lorenzo@kernel.org> wrote:
> >   
> > > Introduce st_lsm6dsx_shub_set_full_scale routine in order to configure
> > > the i2c slave device sensitivity
> > > 
> > > Tested-by: Jimmy Assarsson <jimmyassarsson@gmail.com>
> > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>  
> > I've lost track of what is going on around this driver.
> > One thing is clear though, this doesn't currently apply to my togreg
> > tree.  I'll assume that's because I'm missing something (maybe a fix,
> > or maybe another series).
> > 
> > Give me a poke if I seem to have lost this in a few weeks once all the
> > trees catch up properly after the merge window.
> > 
> > Thanks,
> > 
> > Jonathan  
> 
> Hi Jonathan,
> 
> since this is not a fix but a new feature, does it apply to your testing tree?
> Anyway I guess this patch is important when you apply LIS3MDL support to sensor
> hub driver.
> https://patchwork.kernel.org/patch/11463761/

I poked at it a bit more.  Seems something introduced a bit of fuzz but
otherwise it's fine.  Applied to the togreg branch of iio.git and pushed out
as testing.

Thanks,

Jonathan

> 
> Regards,
> Lorenzo
> 
> >   
> > > ---
> > >  drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 33 ++++++++++++++++++++
> > >  1 file changed, 33 insertions(+)
> > > 
> > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> > > index 64ef07a30726..fec1dbd5f00d 100644
> > > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> > > @@ -518,6 +518,36 @@ st_lsm6dsx_shub_read_raw(struct iio_dev *iio_dev,
> > >  	return ret;
> > >  }
> > >  
> > > +static int
> > > +st_lsm6dsx_shub_set_full_scale(struct st_lsm6dsx_sensor *sensor,
> > > +			       u32 gain)
> > > +{
> > > +	const struct st_lsm6dsx_fs_table_entry *fs_table;
> > > +	int i, err;
> > > +
> > > +	fs_table = &sensor->ext_info.settings->fs_table;
> > > +	if (!fs_table->reg.addr)
> > > +		return -ENOTSUPP;
> > > +
> > > +	for (i = 0; i < fs_table->fs_len; i++) {
> > > +		if (fs_table->fs_avl[i].gain == gain)
> > > +			break;
> > > +	}
> > > +
> > > +	if (i == fs_table->fs_len)
> > > +		return -EINVAL;
> > > +
> > > +	err = st_lsm6dsx_shub_write_with_mask(sensor, fs_table->reg.addr,
> > > +					      fs_table->reg.mask,
> > > +					      fs_table->fs_avl[i].val);
> > > +	if (err < 0)
> > > +		return err;
> > > +
> > > +	sensor->gain = gain;
> > > +
> > > +	return 0;
> > > +}
> > > +
> > >  static int
> > >  st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev,
> > >  			  struct iio_chan_spec const *chan,
> > > @@ -552,6 +582,9 @@ st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev,
> > >  		}
> > >  		break;
> > >  	}
> > > +	case IIO_CHAN_INFO_SCALE:
> > > +		err = st_lsm6dsx_shub_set_full_scale(sensor, val2);
> > > +		break;
> > >  	default:
> > >  		err = -EINVAL;
> > >  		break;  
> >

Patch
diff mbox series

diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
index 64ef07a30726..fec1dbd5f00d 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
@@ -518,6 +518,36 @@  st_lsm6dsx_shub_read_raw(struct iio_dev *iio_dev,
 	return ret;
 }
 
+static int
+st_lsm6dsx_shub_set_full_scale(struct st_lsm6dsx_sensor *sensor,
+			       u32 gain)
+{
+	const struct st_lsm6dsx_fs_table_entry *fs_table;
+	int i, err;
+
+	fs_table = &sensor->ext_info.settings->fs_table;
+	if (!fs_table->reg.addr)
+		return -ENOTSUPP;
+
+	for (i = 0; i < fs_table->fs_len; i++) {
+		if (fs_table->fs_avl[i].gain == gain)
+			break;
+	}
+
+	if (i == fs_table->fs_len)
+		return -EINVAL;
+
+	err = st_lsm6dsx_shub_write_with_mask(sensor, fs_table->reg.addr,
+					      fs_table->reg.mask,
+					      fs_table->fs_avl[i].val);
+	if (err < 0)
+		return err;
+
+	sensor->gain = gain;
+
+	return 0;
+}
+
 static int
 st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev,
 			  struct iio_chan_spec const *chan,
@@ -552,6 +582,9 @@  st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev,
 		}
 		break;
 	}
+	case IIO_CHAN_INFO_SCALE:
+		err = st_lsm6dsx_shub_set_full_scale(sensor, val2);
+		break;
 	default:
 		err = -EINVAL;
 		break;