patch "iio: imu: mpu6050: add missing available scan masks" added to staging-linus
Subsystems (3)
This is a note to let you know that I've just added the patch titled
iio: imu: mpu6050: add missing available scan masks
to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
From 1244a720572fd1680ac8d6b8a4235f2e8557b810 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Maneyrol <[email protected]>
Date: Thu, 27 Jun 2019 13:19:53 +0000
Subject: iio: imu: mpu6050: add missing available scan masks
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.
--- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+)
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +43 -0
@@ -845,6 +845,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 ), {
@@ -871,6 +890,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
@@ -1130,9 +1171,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;
Signature · 1 line
2.22.0