* [PATCH] iio:inv-mpu6050: Fix inconsistency for the scale channel
@ 2015-02-23 14:40 Adriana Reus
2015-03-04 13:57 ` Suman, Viorel
0 siblings, 1 reply; 3+ messages in thread
From: Adriana Reus @ 2015-02-23 14:40 UTC (permalink / raw)
To: jic23, linux-iio; +Cc: linux-kernel, srinivas.pandruvada, Adriana Reus
Fix inconsistency in the semantics of the scale attribute.
For scale the write_raw function was considering the scale table index
and writing the appropriate value into the range register, while
for read_raw it was outputting the actual scale.
Fix this behaviour and adhere to the iio ABI specification.
Signed-off-by: Adriana Reus <adriana.reus@intel.com>
---
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 56 ++++++++++++++++--------------
1 file changed, 30 insertions(+), 26 deletions(-)
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index 9be9b20..4cf056d 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -401,42 +401,46 @@ error_read_raw:
}
}
-static int inv_mpu6050_write_fsr(struct inv_mpu6050_state *st, int fsr)
+static int inv_mpu6050_write_gyro_scale(struct inv_mpu6050_state *st, int val)
{
- int result;
+ int result, i;
u8 d;
- if (fsr < 0 || fsr > INV_MPU6050_MAX_GYRO_FS_PARAM)
- return -EINVAL;
- if (fsr == st->chip_config.fsr)
- return 0;
+ for (i = 0; i < ARRAY_SIZE(gyro_scale_6050); ++i) {
+ if (gyro_scale_6050[i] == val) {
+ d = (i << INV_MPU6050_GYRO_CONFIG_FSR_SHIFT);
+ result = inv_mpu6050_write_reg(st,
+ st->reg->gyro_config, d);
+ if (result)
+ return result;
- d = (fsr << INV_MPU6050_GYRO_CONFIG_FSR_SHIFT);
- result = inv_mpu6050_write_reg(st, st->reg->gyro_config, d);
- if (result)
- return result;
- st->chip_config.fsr = fsr;
+ st->chip_config.fsr = i;
+ return 0;
+ }
+ }
- return 0;
+ return -EINVAL;
}
-static int inv_mpu6050_write_accel_fs(struct inv_mpu6050_state *st, int fs)
+static int inv_mpu6050_write_accel_scale(struct inv_mpu6050_state *st, int val)
{
- int result;
+ int result, i;
u8 d;
- if (fs < 0 || fs > INV_MPU6050_MAX_ACCL_FS_PARAM)
- return -EINVAL;
- if (fs == st->chip_config.accl_fs)
- return 0;
+ for (i = 0; i < ARRAY_SIZE(accel_scale); ++i) {
+ if (accel_scale[i] == val) {
+ d = (i << INV_MPU6050_ACCL_CONFIG_FSR_SHIFT);
+ result = inv_mpu6050_write_reg(st,
+ st->reg->accl_config, d);
+ if (result)
+ return result;
- d = (fs << INV_MPU6050_ACCL_CONFIG_FSR_SHIFT);
- result = inv_mpu6050_write_reg(st, st->reg->accl_config, d);
- if (result)
- return result;
- st->chip_config.accl_fs = fs;
+ st->chip_config.accl_fs = i;
+ return 0;
+ }
+ }
- return 0;
+ return -EINVAL;
}
static int inv_mpu6050_write_raw(struct iio_dev *indio_dev,
@@ -463,10 +467,10 @@ static int inv_mpu6050_write_raw(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_SCALE:
switch (chan->type) {
case IIO_ANGL_VEL:
- result = inv_mpu6050_write_fsr(st, val);
+ result = inv_mpu6050_write_gyro_scale(st, val2);
break;
case IIO_ACCEL:
- result = inv_mpu6050_write_accel_fs(st, val);
+ result = inv_mpu6050_write_accel_scale(st, val2);
break;
default:
result = -EINVAL;
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* RE: [PATCH] iio:inv-mpu6050: Fix inconsistency for the scale channel
2015-02-23 14:40 [PATCH] iio:inv-mpu6050: Fix inconsistency for the scale channel Adriana Reus
@ 2015-03-04 13:57 ` Suman, Viorel
2015-03-08 11:06 ` Jonathan Cameron
0 siblings, 1 reply; 3+ messages in thread
From: Suman, Viorel @ 2015-03-04 13:57 UTC (permalink / raw)
To: Reus, Adriana, jic23@kernel.org, linux-iio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Pandruvada, Srinivas, Reus, Adriana
> -----Original Message-----
> From: linux-iio-owner@vger.kernel.org [mailto:linux-iio-
> owner@vger.kernel.org] On Behalf Of Adriana Reus
> Sent: Monday, February 23, 2015 4:41 PM
> To: jic23@kernel.org; linux-iio@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org; Pandruvada, Srinivas; Reus, Adriana
> Subject: [PATCH] iio:inv-mpu6050: Fix inconsistency for the scale channel
>
> Fix inconsistency in the semantics of the scale attribute.
> For scale the write_raw function was considering the scale table index and
> writing the appropriate value into the range register, while for read_raw it
> was outputting the actual scale.
> Fix this behaviour and adhere to the iio ABI specification.
>
> Signed-off-by: Adriana Reus <adriana.reus@intel.com>
Reviewed-by: Viorel Suman <viorel.suman@intel.com>
> ---
> drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 56 ++++++++++++++++--
> ------------
> 1 file changed, 30 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> index 9be9b20..4cf056d 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
> @@ -401,42 +401,46 @@ error_read_raw:
> }
> }
>
> -static int inv_mpu6050_write_fsr(struct inv_mpu6050_state *st, int fsr)
> +static int inv_mpu6050_write_gyro_scale(struct inv_mpu6050_state *st,
> +int val)
> {
> - int result;
> + int result, i;
> u8 d;
>
> - if (fsr < 0 || fsr > INV_MPU6050_MAX_GYRO_FS_PARAM)
> - return -EINVAL;
> - if (fsr == st->chip_config.fsr)
> - return 0;
> + for (i = 0; i < ARRAY_SIZE(gyro_scale_6050); ++i) {
> + if (gyro_scale_6050[i] == val) {
> + d = (i <<
> INV_MPU6050_GYRO_CONFIG_FSR_SHIFT);
> + result = inv_mpu6050_write_reg(st,
> + st->reg->gyro_config, d);
> + if (result)
> + return result;
>
> - d = (fsr << INV_MPU6050_GYRO_CONFIG_FSR_SHIFT);
> - result = inv_mpu6050_write_reg(st, st->reg->gyro_config, d);
> - if (result)
> - return result;
> - st->chip_config.fsr = fsr;
> + st->chip_config.fsr = i;
> + return 0;
> + }
> + }
>
> - return 0;
> + return -EINVAL;
> }
>
> -static int inv_mpu6050_write_accel_fs(struct inv_mpu6050_state *st, int
> fs)
> +static int inv_mpu6050_write_accel_scale(struct inv_mpu6050_state *st,
> +int val)
> {
> - int result;
> + int result, i;
> u8 d;
>
> - if (fs < 0 || fs > INV_MPU6050_MAX_ACCL_FS_PARAM)
> - return -EINVAL;
> - if (fs == st->chip_config.accl_fs)
> - return 0;
> + for (i = 0; i < ARRAY_SIZE(accel_scale); ++i) {
> + if (accel_scale[i] == val) {
> + d = (i << INV_MPU6050_ACCL_CONFIG_FSR_SHIFT);
> + result = inv_mpu6050_write_reg(st,
> + st->reg->accl_config, d);
> + if (result)
> + return result;
>
> - d = (fs << INV_MPU6050_ACCL_CONFIG_FSR_SHIFT);
> - result = inv_mpu6050_write_reg(st, st->reg->accl_config, d);
> - if (result)
> - return result;
> - st->chip_config.accl_fs = fs;
> + st->chip_config.accl_fs = i;
> + return 0;
> + }
> + }
>
> - return 0;
> + return -EINVAL;
> }
>
> static int inv_mpu6050_write_raw(struct iio_dev *indio_dev, @@ -463,10
> +467,10 @@ static int inv_mpu6050_write_raw(struct iio_dev *indio_dev,
> case IIO_CHAN_INFO_SCALE:
> switch (chan->type) {
> case IIO_ANGL_VEL:
> - result = inv_mpu6050_write_fsr(st, val);
> + result = inv_mpu6050_write_gyro_scale(st, val2);
> break;
> case IIO_ACCEL:
> - result = inv_mpu6050_write_accel_fs(st, val);
> + result = inv_mpu6050_write_accel_scale(st, val2);
> break;
> default:
> result = -EINVAL;
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in the
> body of a message to majordomo@vger.kernel.org More majordomo info
> at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] iio:inv-mpu6050: Fix inconsistency for the scale channel
2015-03-04 13:57 ` Suman, Viorel
@ 2015-03-08 11:06 ` Jonathan Cameron
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2015-03-08 11:06 UTC (permalink / raw)
To: Suman, Viorel, Reus, Adriana, linux-iio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Pandruvada, Srinivas, Ge Gao
On 04/03/15 13:57, Suman, Viorel wrote:
>
>> -----Original Message-----
>> From: linux-iio-owner@vger.kernel.org [mailto:linux-iio-
>> owner@vger.kernel.org] On Behalf Of Adriana Reus
>> Sent: Monday, February 23, 2015 4:41 PM
>> To: jic23@kernel.org; linux-iio@vger.kernel.org
>> Cc: linux-kernel@vger.kernel.org; Pandruvada, Srinivas; Reus, Adriana
>> Subject: [PATCH] iio:inv-mpu6050: Fix inconsistency for the scale channel
>>
>> Fix inconsistency in the semantics of the scale attribute.
>> For scale the write_raw function was considering the scale table index and
>> writing the appropriate value into the range register, while for read_raw it
>> was outputting the actual scale.
>> Fix this behaviour and adhere to the iio ABI specification.
>>
>> Signed-off-by: Adriana Reus <adriana.reus@intel.com>
>
> Reviewed-by: Viorel Suman <viorel.suman@intel.com>
Good catch. I'd just like to give Ge an opportunity to comment
before applying it.
Please do CC the original driver author as often they've moved on to
other stuff and aren't actively reading linux-iio anymore.
Jonathan
>
>> ---
>> drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 56 ++++++++++++++++--
>> ------------
>> 1 file changed, 30 insertions(+), 26 deletions(-)
>>
>> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
>> b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
>> index 9be9b20..4cf056d 100644
>> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
>> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
>> @@ -401,42 +401,46 @@ error_read_raw:
>> }
>> }
>>
>> -static int inv_mpu6050_write_fsr(struct inv_mpu6050_state *st, int fsr)
>> +static int inv_mpu6050_write_gyro_scale(struct inv_mpu6050_state *st,
>> +int val)
>> {
>> - int result;
>> + int result, i;
>> u8 d;
>>
>> - if (fsr < 0 || fsr > INV_MPU6050_MAX_GYRO_FS_PARAM)
>> - return -EINVAL;
>> - if (fsr == st->chip_config.fsr)
>> - return 0;
>> + for (i = 0; i < ARRAY_SIZE(gyro_scale_6050); ++i) {
>> + if (gyro_scale_6050[i] == val) {
>> + d = (i <<
>> INV_MPU6050_GYRO_CONFIG_FSR_SHIFT);
>> + result = inv_mpu6050_write_reg(st,
>> + st->reg->gyro_config, d);
>> + if (result)
>> + return result;
>>
>> - d = (fsr << INV_MPU6050_GYRO_CONFIG_FSR_SHIFT);
>> - result = inv_mpu6050_write_reg(st, st->reg->gyro_config, d);
>> - if (result)
>> - return result;
>> - st->chip_config.fsr = fsr;
>> + st->chip_config.fsr = i;
>> + return 0;
>> + }
>> + }
>>
>> - return 0;
>> + return -EINVAL;
>> }
>>
>> -static int inv_mpu6050_write_accel_fs(struct inv_mpu6050_state *st, int
>> fs)
>> +static int inv_mpu6050_write_accel_scale(struct inv_mpu6050_state *st,
>> +int val)
>> {
>> - int result;
>> + int result, i;
>> u8 d;
>>
>> - if (fs < 0 || fs > INV_MPU6050_MAX_ACCL_FS_PARAM)
>> - return -EINVAL;
>> - if (fs == st->chip_config.accl_fs)
>> - return 0;
>> + for (i = 0; i < ARRAY_SIZE(accel_scale); ++i) {
>> + if (accel_scale[i] == val) {
>> + d = (i << INV_MPU6050_ACCL_CONFIG_FSR_SHIFT);
>> + result = inv_mpu6050_write_reg(st,
>> + st->reg->accl_config, d);
>> + if (result)
>> + return result;
>>
>> - d = (fs << INV_MPU6050_ACCL_CONFIG_FSR_SHIFT);
>> - result = inv_mpu6050_write_reg(st, st->reg->accl_config, d);
>> - if (result)
>> - return result;
>> - st->chip_config.accl_fs = fs;
>> + st->chip_config.accl_fs = i;
>> + return 0;
>> + }
>> + }
>>
>> - return 0;
>> + return -EINVAL;
>> }
>>
>> static int inv_mpu6050_write_raw(struct iio_dev *indio_dev, @@ -463,10
>> +467,10 @@ static int inv_mpu6050_write_raw(struct iio_dev *indio_dev,
>> case IIO_CHAN_INFO_SCALE:
>> switch (chan->type) {
>> case IIO_ANGL_VEL:
>> - result = inv_mpu6050_write_fsr(st, val);
>> + result = inv_mpu6050_write_gyro_scale(st, val2);
>> break;
>> case IIO_ACCEL:
>> - result = inv_mpu6050_write_accel_fs(st, val);
>> + result = inv_mpu6050_write_accel_scale(st, val2);
>> break;
>> default:
>> result = -EINVAL;
>> --
>> 1.9.1
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-iio" in the
>> body of a message to majordomo@vger.kernel.org More majordomo info
>> at http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-08 11:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-23 14:40 [PATCH] iio:inv-mpu6050: Fix inconsistency for the scale channel Adriana Reus
2015-03-04 13:57 ` Suman, Viorel
2015-03-08 11:06 ` 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).