From: Jonathan Cameron <jic23@jic23.retrosnub.co.uk>
To: Jean-Baptiste Maneyrol <JManeyrol@invensense.com>
Cc: "linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: [PATCH v2] iio: imu: mpu6050: add missing available scan masks
Date: Sun, 14 Jul 2019 18:20:26 +0100 [thread overview]
Message-ID: <20190714182026.5edebf23@archlinux> (raw)
In-Reply-To: <20190627131918.19619-1-jmaneyrol@invensense.com>
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;
next prev parent reply other threads:[~2019-07-14 17:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
2019-07-17 13:45 ` Jean-Baptiste Maneyrol
2019-07-27 21:31 ` Jonathan Cameron
Reply instructions:
You may reply publicly 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=20190714182026.5edebf23@archlinux \
--to=jic23@jic23.retrosnub.co.uk \
--cc=JManeyrol@invensense.com \
--cc=linux-iio@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).