* [PATCH v2] iio: imu: mpu6050: add missing available scan masks
@ 2019-06-27 13:19 Jean-Baptiste Maneyrol
2019-07-14 17:20 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Jean-Baptiste Maneyrol @ 2019-06-27 13:19 UTC (permalink / raw)
To: linux-iio@vger.kernel.org; +Cc: stable@vger.kernel.org, Jean-Baptiste Maneyrol
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(+)
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;
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] iio: imu: mpu6050: add missing available scan masks
2019-06-27 13:19 [PATCH v2] iio: imu: mpu6050: add missing available scan masks Jean-Baptiste Maneyrol
@ 2019-07-14 17:20 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2019-07-14 17:20 UTC (permalink / raw)
To: Jean-Baptiste Maneyrol; +Cc: linux-iio@vger.kernel.org, stable@vger.kernel.org
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;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-14 17:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-27 13:19 [PATCH v2] iio: imu: mpu6050: add missing available scan masks Jean-Baptiste Maneyrol
2019-07-14 17:20 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).