| Message ID | 20190627131918.19619-1-jmaneyrol@invensense.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] iio: imu: mpu6050: add missing available scan masks | expand |
On Thu, 27 Jun 2019 13:19:53 +0000 Jean-Baptiste Maneyrol <JManeyrol@invensense.com> wrote: > Driver only supports 3-axis gyro and/or 3-axis accel. > For icm20602, temp data is mandatory for all configurations. > > Fix all single and double axis configurations (almost never used) and more > importantly fix 3-axis gyro and 6-axis accel+gyro buffer on icm20602 when > temp data is not enabled. > > Signed-off-by: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com> > Fixes: 1615fe41a195 ("iio: imu: mpu6050: Fix FIFO layout for ICM20602") Something odd happened in this email that meant my client saved it as garbage. Oh well, cut and pasted worked ;) Applied to the fixes-togreg branch of iio.git and marked for stable. Thanks, Jonathan > --- > Changes in v2: > - Use more explicit scan defines for masks > > drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 43 ++++++++++++++++++++++ > 1 file changed, 43 insertions(+) > > diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > index 385f14a4d5a7..66629c3adc21 100644 > --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > @@ -851,6 +851,25 @@ static const struct iio_chan_spec inv_mpu_channels[] = { > INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_Z, INV_MPU6050_SCAN_ACCL_Z), > }; > > +static const unsigned long inv_mpu_scan_masks[] = { > + /* 3-axis accel */ > + BIT(INV_MPU6050_SCAN_ACCL_X) > + | BIT(INV_MPU6050_SCAN_ACCL_Y) > + | BIT(INV_MPU6050_SCAN_ACCL_Z), > + /* 3-axis gyro */ > + BIT(INV_MPU6050_SCAN_GYRO_X) > + | BIT(INV_MPU6050_SCAN_GYRO_Y) > + | BIT(INV_MPU6050_SCAN_GYRO_Z), > + /* 6-axis accel + gyro */ > + BIT(INV_MPU6050_SCAN_ACCL_X) > + | BIT(INV_MPU6050_SCAN_ACCL_Y) > + | BIT(INV_MPU6050_SCAN_ACCL_Z) > + | BIT(INV_MPU6050_SCAN_GYRO_X) > + | BIT(INV_MPU6050_SCAN_GYRO_Y) > + | BIT(INV_MPU6050_SCAN_GYRO_Z), > + 0, > +}; > + > static const struct iio_chan_spec inv_icm20602_channels[] = { > IIO_CHAN_SOFT_TIMESTAMP(INV_ICM20602_SCAN_TIMESTAMP), > { > @@ -877,6 +896,28 @@ static const struct iio_chan_spec inv_icm20602_channels[] = { > INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_Z, INV_ICM20602_SCAN_ACCL_Z), > }; > > +static const unsigned long inv_icm20602_scan_masks[] = { > + /* 3-axis accel + temp (mandatory) */ > + BIT(INV_ICM20602_SCAN_ACCL_X) > + | BIT(INV_ICM20602_SCAN_ACCL_Y) > + | BIT(INV_ICM20602_SCAN_ACCL_Z) > + | BIT(INV_ICM20602_SCAN_TEMP), > + /* 3-axis gyro + temp (mandatory) */ > + BIT(INV_ICM20602_SCAN_GYRO_X) > + | BIT(INV_ICM20602_SCAN_GYRO_Y) > + | BIT(INV_ICM20602_SCAN_GYRO_Z) > + | BIT(INV_ICM20602_SCAN_TEMP), > + /* 6-axis accel + gyro + temp (mandatory) */ > + BIT(INV_ICM20602_SCAN_ACCL_X) > + | BIT(INV_ICM20602_SCAN_ACCL_Y) > + | BIT(INV_ICM20602_SCAN_ACCL_Z) > + | BIT(INV_ICM20602_SCAN_GYRO_X) > + | BIT(INV_ICM20602_SCAN_GYRO_Y) > + | BIT(INV_ICM20602_SCAN_GYRO_Z) > + | BIT(INV_ICM20602_SCAN_TEMP), > + 0, > +}; > + > /* > * The user can choose any frequency between INV_MPU6050_MIN_FIFO_RATE and > * INV_MPU6050_MAX_FIFO_RATE, but only these frequencies are matched by the > @@ -1136,9 +1177,11 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name, > if (chip_type == INV_ICM20602) { > indio_dev->channels = inv_icm20602_channels; > indio_dev->num_channels = ARRAY_SIZE(inv_icm20602_channels); > + indio_dev->available_scan_masks = inv_icm20602_scan_masks; > } else { > indio_dev->channels = inv_mpu_channels; > indio_dev->num_channels = ARRAY_SIZE(inv_mpu_channels); > + indio_dev->available_scan_masks = inv_mpu_scan_masks; > } > > indio_dev->info = &mpu_info;
Hello Jonathan, I am still not seeing this patch in the fixes-togreg branch or in the testing branch. Neither in the testing-fixes branch. Is this expected? Thanks for your response. JB From: linux-iio-owner@vger.kernel.org <linux-iio-owner@vger.kernel.org> on behalf of Jonathan Cameron <jic23@jic23.retrosnub.co.uk> Sent: Sunday, July 14, 2019 19:20 To: Jean-Baptiste Maneyrol Cc: linux-iio@vger.kernel.org; stable@vger.kernel.org Subject: Re: [PATCH v2] iio: imu: mpu6050: add missing available scan masks CAUTION: This email originated from outside of the organization. Please make sure the sender is who they say they are and do not click links or open attachments unless you recognize the sender and know the content is safe. On Thu, 27 Jun 2019 13:19:53 +0000 Jean-Baptiste Maneyrol <JManeyrol@invensense.com> wrote: > Driver only supports 3-axis gyro and/or 3-axis accel. > For icm20602, temp data is mandatory for all configurations. > > Fix all single and double axis configurations (almost never used) and more > importantly fix 3-axis gyro and 6-axis accel+gyro buffer on icm20602 when > temp data is not enabled. > > Signed-off-by: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com> > Fixes: 1615fe41a195 ("iio: imu: mpu6050: Fix FIFO layout for ICM20602") Something odd happened in this email that meant my client saved it as garbage. Oh well, cut and pasted worked ;) Applied to the fixes-togreg branch of iio.git and marked for stable. Thanks, Jonathan > --- > Changes in v2: > - Use more explicit scan defines for masks > > drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 43 ++++++++++++++++++++++ > 1 file changed, 43 insertions(+) > > diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > index 385f14a4d5a7..66629c3adc21 100644 > --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > @@ -851,6 +851,25 @@ static const struct iio_chan_spec inv_mpu_channels[] = { > INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_Z, INV_MPU6050_SCAN_ACCL_Z), > }; > > +static const unsigned long inv_mpu_scan_masks[] = { > + /* 3-axis accel */ > + BIT(INV_MPU6050_SCAN_ACCL_X) > + | BIT(INV_MPU6050_SCAN_ACCL_Y) > + | BIT(INV_MPU6050_SCAN_ACCL_Z), > + /* 3-axis gyro */ > + BIT(INV_MPU6050_SCAN_GYRO_X) > + | BIT(INV_MPU6050_SCAN_GYRO_Y) > + | BIT(INV_MPU6050_SCAN_GYRO_Z), > + /* 6-axis accel + gyro */ > + BIT(INV_MPU6050_SCAN_ACCL_X) > + | BIT(INV_MPU6050_SCAN_ACCL_Y) > + | BIT(INV_MPU6050_SCAN_ACCL_Z) > + | BIT(INV_MPU6050_SCAN_GYRO_X) > + | BIT(INV_MPU6050_SCAN_GYRO_Y) > + | BIT(INV_MPU6050_SCAN_GYRO_Z), > + 0, > +}; > + > static const struct iio_chan_spec inv_icm20602_channels[] = { > IIO_CHAN_SOFT_TIMESTAMP(INV_ICM20602_SCAN_TIMESTAMP), > { > @@ -877,6 +896,28 @@ static const struct iio_chan_spec inv_icm20602_channels[] = { > INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_Z, INV_ICM20602_SCAN_ACCL_Z), > }; > > +static const unsigned long inv_icm20602_scan_masks[] = { > + /* 3-axis accel + temp (mandatory) */ > + BIT(INV_ICM20602_SCAN_ACCL_X) > + | BIT(INV_ICM20602_SCAN_ACCL_Y) > + | BIT(INV_ICM20602_SCAN_ACCL_Z) > + | BIT(INV_ICM20602_SCAN_TEMP), > + /* 3-axis gyro + temp (mandatory) */ > + BIT(INV_ICM20602_SCAN_GYRO_X) > + | BIT(INV_ICM20602_SCAN_GYRO_Y) > + | BIT(INV_ICM20602_SCAN_GYRO_Z) > + | BIT(INV_ICM20602_SCAN_TEMP), > + /* 6-axis accel + gyro + temp (mandatory) */ > + BIT(INV_ICM20602_SCAN_ACCL_X) > + | BIT(INV_ICM20602_SCAN_ACCL_Y) > + | BIT(INV_ICM20602_SCAN_ACCL_Z) > + | BIT(INV_ICM20602_SCAN_GYRO_X) > + | BIT(INV_ICM20602_SCAN_GYRO_Y) > + | BIT(INV_ICM20602_SCAN_GYRO_Z) > + | BIT(INV_ICM20602_SCAN_TEMP), > + 0, > +}; > + > /* > * The user can choose any frequency between INV_MPU6050_MIN_FIFO_RATE and > * INV_MPU6050_MAX_FIFO_RATE, but only these frequencies are matched by the > @@ -1136,9 +1177,11 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name, > if (chip_type == INV_ICM20602) { > indio_dev->channels = inv_icm20602_channels; > indio_dev->num_channels = ARRAY_SIZE(inv_icm20602_channels); > + indio_dev->available_scan_masks = inv_icm20602_scan_masks; > } else { > indio_dev->channels = inv_mpu_channels; > indio_dev->num_channels = ARRAY_SIZE(inv_mpu_channels); > + indio_dev->available_scan_masks = inv_mpu_scan_masks; > } > > indio_dev->info = &mpu_info;
On Wed, 17 Jul 2019 13:45:07 +0000 Jean-Baptiste Maneyrol <JManeyrol@invensense.com> wrote: > Hello Jonathan, > > I am still not seeing this patch in the fixes-togreg branch or in the testing branch. Neither in the testing-fixes branch. > > Is this expected? I've been in a bit of a mess due to travel etc, so more than possible I hadn't pushed it out as I should have done. https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git/commit/?h=fixes-togreg&id=1244a720572fd1680ac8d6b8a4235f2e8557b810 I didn't see this before I'd pushed out for Arnd's patch hence not sure if it was there before or not! Sorry about that, Jonathan > > Thanks for your response. > JB > > From: linux-iio-owner@vger.kernel.org <linux-iio-owner@vger.kernel.org> on behalf of Jonathan Cameron <jic23@jic23.retrosnub.co.uk> > > Sent: Sunday, July 14, 2019 19:20 > > To: Jean-Baptiste Maneyrol > > Cc: linux-iio@vger.kernel.org; stable@vger.kernel.org > > Subject: Re: [PATCH v2] iio: imu: mpu6050: add missing available scan masks > > > > > CAUTION: This email originated from outside of the organization. Please make sure the sender is who they say they are and do not click links or open attachments unless you recognize the sender and know the content is safe. > > > > On Thu, 27 Jun 2019 13:19:53 +0000 > > Jean-Baptiste Maneyrol <JManeyrol@invensense.com> wrote: > > > > > Driver only supports 3-axis gyro and/or 3-axis accel. > > > For icm20602, temp data is mandatory for all configurations. > > > > > > Fix all single and double axis configurations (almost never used) and more > > > importantly fix 3-axis gyro and 6-axis accel+gyro buffer on icm20602 when > > > temp data is not enabled. > > > > > > Signed-off-by: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com> > > > Fixes: 1615fe41a195 ("iio: imu: mpu6050: Fix FIFO layout for ICM20602") > > Something odd happened in this email that meant my client saved it as garbage. > > Oh well, cut and pasted worked ;) > > > > Applied to the fixes-togreg branch of iio.git and marked for stable. > > > > Thanks, > > > > Jonathan > > > > > --- > > > Changes in v2: > > > - Use more explicit scan defines for masks > > > > > > drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 43 ++++++++++++++++++++++ > > > 1 file changed, 43 insertions(+) > > > > > > diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > > > index 385f14a4d5a7..66629c3adc21 100644 > > > --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > > > +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > > > @@ -851,6 +851,25 @@ static const struct iio_chan_spec inv_mpu_channels[] = { > > > INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_Z, INV_MPU6050_SCAN_ACCL_Z), > > > }; > > > > > > +static const unsigned long inv_mpu_scan_masks[] = { > > > + /* 3-axis accel */ > > > + BIT(INV_MPU6050_SCAN_ACCL_X) > > > + | BIT(INV_MPU6050_SCAN_ACCL_Y) > > > + | BIT(INV_MPU6050_SCAN_ACCL_Z), > > > + /* 3-axis gyro */ > > > + BIT(INV_MPU6050_SCAN_GYRO_X) > > > + | BIT(INV_MPU6050_SCAN_GYRO_Y) > > > + | BIT(INV_MPU6050_SCAN_GYRO_Z), > > > + /* 6-axis accel + gyro */ > > > + BIT(INV_MPU6050_SCAN_ACCL_X) > > > + | BIT(INV_MPU6050_SCAN_ACCL_Y) > > > + | BIT(INV_MPU6050_SCAN_ACCL_Z) > > > + | BIT(INV_MPU6050_SCAN_GYRO_X) > > > + | BIT(INV_MPU6050_SCAN_GYRO_Y) > > > + | BIT(INV_MPU6050_SCAN_GYRO_Z), > > > + 0, > > > +}; > > > + > > > static const struct iio_chan_spec inv_icm20602_channels[] = { > > > IIO_CHAN_SOFT_TIMESTAMP(INV_ICM20602_SCAN_TIMESTAMP), > > > { > > > @@ -877,6 +896,28 @@ static const struct iio_chan_spec inv_icm20602_channels[] = { > > > INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_Z, INV_ICM20602_SCAN_ACCL_Z), > > > }; > > > > > > +static const unsigned long inv_icm20602_scan_masks[] = { > > > + /* 3-axis accel + temp (mandatory) */ > > > + BIT(INV_ICM20602_SCAN_ACCL_X) > > > + | BIT(INV_ICM20602_SCAN_ACCL_Y) > > > + | BIT(INV_ICM20602_SCAN_ACCL_Z) > > > + | BIT(INV_ICM20602_SCAN_TEMP), > > > + /* 3-axis gyro + temp (mandatory) */ > > > + BIT(INV_ICM20602_SCAN_GYRO_X) > > > + | BIT(INV_ICM20602_SCAN_GYRO_Y) > > > + | BIT(INV_ICM20602_SCAN_GYRO_Z) > > > + | BIT(INV_ICM20602_SCAN_TEMP), > > > + /* 6-axis accel + gyro + temp (mandatory) */ > > > + BIT(INV_ICM20602_SCAN_ACCL_X) > > > + | BIT(INV_ICM20602_SCAN_ACCL_Y) > > > + | BIT(INV_ICM20602_SCAN_ACCL_Z) > > > + | BIT(INV_ICM20602_SCAN_GYRO_X) > > > + | BIT(INV_ICM20602_SCAN_GYRO_Y) > > > + | BIT(INV_ICM20602_SCAN_GYRO_Z) > > > + | BIT(INV_ICM20602_SCAN_TEMP), > > > + 0, > > > +}; > > > + > > > /* > > > * The user can choose any frequency between INV_MPU6050_MIN_FIFO_RATE and > > > * INV_MPU6050_MAX_FIFO_RATE, but only these frequencies are matched by the > > > @@ -1136,9 +1177,11 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name, > > > if (chip_type == INV_ICM20602) { > > > indio_dev->channels = inv_icm20602_channels; > > > indio_dev->num_channels = ARRAY_SIZE(inv_icm20602_channels); > > > + indio_dev->available_scan_masks = inv_icm20602_scan_masks; > > > } else { > > > indio_dev->channels = inv_mpu_channels; > > > indio_dev->num_channels = ARRAY_SIZE(inv_mpu_channels); > > > + indio_dev->available_scan_masks = inv_mpu_scan_masks; > > > } > > > > > > indio_dev->info = &mpu_info; > > >
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c index 385f14a4d5a7..66629c3adc21 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c @@ -851,6 +851,25 @@ static const struct iio_chan_spec inv_mpu_channels[] = { INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_Z, INV_MPU6050_SCAN_ACCL_Z), }; +static const unsigned long inv_mpu_scan_masks[] = { + /* 3-axis accel */ + BIT(INV_MPU6050_SCAN_ACCL_X) + | BIT(INV_MPU6050_SCAN_ACCL_Y) + | BIT(INV_MPU6050_SCAN_ACCL_Z), + /* 3-axis gyro */ + BIT(INV_MPU6050_SCAN_GYRO_X) + | BIT(INV_MPU6050_SCAN_GYRO_Y) + | BIT(INV_MPU6050_SCAN_GYRO_Z), + /* 6-axis accel + gyro */ + BIT(INV_MPU6050_SCAN_ACCL_X) + | BIT(INV_MPU6050_SCAN_ACCL_Y) + | BIT(INV_MPU6050_SCAN_ACCL_Z) + | BIT(INV_MPU6050_SCAN_GYRO_X) + | BIT(INV_MPU6050_SCAN_GYRO_Y) + | BIT(INV_MPU6050_SCAN_GYRO_Z), + 0, +}; + static const struct iio_chan_spec inv_icm20602_channels[] = { IIO_CHAN_SOFT_TIMESTAMP(INV_ICM20602_SCAN_TIMESTAMP), { @@ -877,6 +896,28 @@ static const struct iio_chan_spec inv_icm20602_channels[] = { INV_MPU6050_CHAN(IIO_ACCEL, IIO_MOD_Z, INV_ICM20602_SCAN_ACCL_Z), }; +static const unsigned long inv_icm20602_scan_masks[] = { + /* 3-axis accel + temp (mandatory) */ + BIT(INV_ICM20602_SCAN_ACCL_X) + | BIT(INV_ICM20602_SCAN_ACCL_Y) + | BIT(INV_ICM20602_SCAN_ACCL_Z) + | BIT(INV_ICM20602_SCAN_TEMP), + /* 3-axis gyro + temp (mandatory) */ + BIT(INV_ICM20602_SCAN_GYRO_X) + | BIT(INV_ICM20602_SCAN_GYRO_Y) + | BIT(INV_ICM20602_SCAN_GYRO_Z) + | BIT(INV_ICM20602_SCAN_TEMP), + /* 6-axis accel + gyro + temp (mandatory) */ + BIT(INV_ICM20602_SCAN_ACCL_X) + | BIT(INV_ICM20602_SCAN_ACCL_Y) + | BIT(INV_ICM20602_SCAN_ACCL_Z) + | BIT(INV_ICM20602_SCAN_GYRO_X) + | BIT(INV_ICM20602_SCAN_GYRO_Y) + | BIT(INV_ICM20602_SCAN_GYRO_Z) + | BIT(INV_ICM20602_SCAN_TEMP), + 0, +}; + /* * The user can choose any frequency between INV_MPU6050_MIN_FIFO_RATE and * INV_MPU6050_MAX_FIFO_RATE, but only these frequencies are matched by the @@ -1136,9 +1177,11 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name, if (chip_type == INV_ICM20602) { indio_dev->channels = inv_icm20602_channels; indio_dev->num_channels = ARRAY_SIZE(inv_icm20602_channels); + indio_dev->available_scan_masks = inv_icm20602_scan_masks; } else { indio_dev->channels = inv_mpu_channels; indio_dev->num_channels = ARRAY_SIZE(inv_mpu_channels); + indio_dev->available_scan_masks = inv_mpu_scan_masks; } indio_dev->info = &mpu_info;
Driver only supports 3-axis gyro and/or 3-axis accel. For icm20602, temp data is mandatory for all configurations. Fix all single and double axis configurations (almost never used) and more importantly fix 3-axis gyro and 6-axis accel+gyro buffer on icm20602 when temp data is not enabled. Signed-off-by: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com> Fixes: 1615fe41a195 ("iio: imu: mpu6050: Fix FIFO layout for ICM20602") --- Changes in v2: - Use more explicit scan defines for masks drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+)