* [PATCH 1/3] iio:kxcjk-1013: Correct error messages
2014-07-14 20:38 [PATCH 0/3] iio: accel driver fixes Peter Meerwald
@ 2014-07-14 20:38 ` Peter Meerwald
2014-07-14 22:58 ` Srinivas Pandruvada
2014-07-14 20:38 ` [PATCH 2/3] iio:kxcjk-1013: Fix endianness in scan_type Peter Meerwald
2014-07-14 20:38 ` [PATCH 3/3] iio:bma180: Fix scale factors to report correct acceleration units Peter Meerwald
2 siblings, 1 reply; 10+ messages in thread
From: Peter Meerwald @ 2014-07-14 20:38 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, Peter Meerwald, Srinivas Pandruvada
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
drivers/iio/accel/kxcjk-1013.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
index 72a6dbb..a11588c 100644
--- a/drivers/iio/accel/kxcjk-1013.c
+++ b/drivers/iio/accel/kxcjk-1013.c
@@ -144,7 +144,7 @@ static int kxcjk1013_chip_ack_intr(struct kxcjk1013_data *data)
ret = i2c_smbus_read_byte_data(data->client, KXCJK1013_REG_INT_REL);
if (ret < 0) {
- dev_err(&data->client->dev, "Error writing reg_int_rel\n");
+ dev_err(&data->client->dev, "Error reading reg_int_rel\n");
return ret;
}
@@ -183,7 +183,7 @@ static int kxcjk1013_chip_init(struct kxcjk1013_data *data)
ret = i2c_smbus_write_byte_data(data->client, KXCJK1013_REG_CTRL1,
ret);
if (ret < 0) {
- dev_err(&data->client->dev, "Error reading reg_ctrl\n");
+ dev_err(&data->client->dev, "Error writing reg_ctrl1\n");
return ret;
}
@@ -337,7 +337,7 @@ static int kxcjk1013_get_acc_reg(struct kxcjk1013_data *data, int axis)
ret = i2c_smbus_read_word_data(data->client, reg);
if (ret < 0) {
dev_err(&data->client->dev,
- "failed to read accel_%c registers\n", 'x' + axis);
+ "failed to read accel_%c register\n", 'x' + axis);
return ret;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 1/3] iio:kxcjk-1013: Correct error messages
2014-07-14 20:38 ` [PATCH 1/3] iio:kxcjk-1013: Correct error messages Peter Meerwald
@ 2014-07-14 22:58 ` Srinivas Pandruvada
2014-07-20 16:51 ` Jonathan Cameron
0 siblings, 1 reply; 10+ messages in thread
From: Srinivas Pandruvada @ 2014-07-14 22:58 UTC (permalink / raw)
To: Peter Meerwald; +Cc: linux-iio, jic23
On 07/14/2014 01:38 PM, Peter Meerwald wrote:
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
> Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> ---
> drivers/iio/accel/kxcjk-1013.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
> index 72a6dbb..a11588c 100644
> --- a/drivers/iio/accel/kxcjk-1013.c
> +++ b/drivers/iio/accel/kxcjk-1013.c
> @@ -144,7 +144,7 @@ static int kxcjk1013_chip_ack_intr(struct kxcjk1013_data *data)
>
> ret = i2c_smbus_read_byte_data(data->client, KXCJK1013_REG_INT_REL);
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error writing reg_int_rel\n");
> + dev_err(&data->client->dev, "Error reading reg_int_rel\n");
> return ret;
> }
>
> @@ -183,7 +183,7 @@ static int kxcjk1013_chip_init(struct kxcjk1013_data *data)
> ret = i2c_smbus_write_byte_data(data->client, KXCJK1013_REG_CTRL1,
> ret);
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error reading reg_ctrl\n");
> + dev_err(&data->client->dev, "Error writing reg_ctrl1\n");
> return ret;
> }
>
> @@ -337,7 +337,7 @@ static int kxcjk1013_get_acc_reg(struct kxcjk1013_data *data, int axis)
> ret = i2c_smbus_read_word_data(data->client, reg);
> if (ret < 0) {
> dev_err(&data->client->dev,
> - "failed to read accel_%c registers\n", 'x' + axis);
> + "failed to read accel_%c register\n", 'x' + axis);
> return ret;
> }
>
>
Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 1/3] iio:kxcjk-1013: Correct error messages
2014-07-14 22:58 ` Srinivas Pandruvada
@ 2014-07-20 16:51 ` Jonathan Cameron
2014-09-14 19:54 ` Jonathan Cameron
0 siblings, 1 reply; 10+ messages in thread
From: Jonathan Cameron @ 2014-07-20 16:51 UTC (permalink / raw)
To: Srinivas Pandruvada, Peter Meerwald; +Cc: linux-iio
On 14/07/14 23:58, Srinivas Pandruvada wrote:
> On 07/14/2014 01:38 PM, Peter Meerwald wrote:
>> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
>> Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
This one doesn't apply cleanly on top of Srinivas' patches that I took
earlier today. I'll hold it for now as it's not as urgent as the next
one and sort it out after Srinivas' series is all in place.
J
>> ---
>> drivers/iio/accel/kxcjk-1013.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
>> index 72a6dbb..a11588c 100644
>> --- a/drivers/iio/accel/kxcjk-1013.c
>> +++ b/drivers/iio/accel/kxcjk-1013.c
>> @@ -144,7 +144,7 @@ static int kxcjk1013_chip_ack_intr(struct kxcjk1013_data *data)
>>
>> ret = i2c_smbus_read_byte_data(data->client, KXCJK1013_REG_INT_REL);
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error writing reg_int_rel\n");
>> + dev_err(&data->client->dev, "Error reading reg_int_rel\n");
>> return ret;
>> }
>>
>> @@ -183,7 +183,7 @@ static int kxcjk1013_chip_init(struct kxcjk1013_data *data)
>> ret = i2c_smbus_write_byte_data(data->client, KXCJK1013_REG_CTRL1,
>> ret);
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error reading reg_ctrl\n");
>> + dev_err(&data->client->dev, "Error writing reg_ctrl1\n");
>> return ret;
>> }
>>
>> @@ -337,7 +337,7 @@ static int kxcjk1013_get_acc_reg(struct kxcjk1013_data *data, int axis)
>> ret = i2c_smbus_read_word_data(data->client, reg);
>> if (ret < 0) {
>> dev_err(&data->client->dev,
>> - "failed to read accel_%c registers\n", 'x' + axis);
>> + "failed to read accel_%c register\n", 'x' + axis);
>> return ret;
>> }
>>
>>
> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 1/3] iio:kxcjk-1013: Correct error messages
2014-07-20 16:51 ` Jonathan Cameron
@ 2014-09-14 19:54 ` Jonathan Cameron
0 siblings, 0 replies; 10+ messages in thread
From: Jonathan Cameron @ 2014-09-14 19:54 UTC (permalink / raw)
To: Srinivas Pandruvada, Peter Meerwald; +Cc: linux-iio
On 20/07/14 17:51, Jonathan Cameron wrote:
> On 14/07/14 23:58, Srinivas Pandruvada wrote:
>> On 07/14/2014 01:38 PM, Peter Meerwald wrote:
>>> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
>>> Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> This one doesn't apply cleanly on top of Srinivas' patches that I took
> earlier today. I'll hold it for now as it's not as urgent as the next
> one and sort it out after Srinivas' series is all in place.
>
No longer relevant as far as I can see so dropped.
> J
>>> ---
>>> drivers/iio/accel/kxcjk-1013.c | 6 +++---
>>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
>>> index 72a6dbb..a11588c 100644
>>> --- a/drivers/iio/accel/kxcjk-1013.c
>>> +++ b/drivers/iio/accel/kxcjk-1013.c
>>> @@ -144,7 +144,7 @@ static int kxcjk1013_chip_ack_intr(struct kxcjk1013_data *data)
>>>
>>> ret = i2c_smbus_read_byte_data(data->client, KXCJK1013_REG_INT_REL);
>>> if (ret < 0) {
>>> - dev_err(&data->client->dev, "Error writing reg_int_rel\n");
>>> + dev_err(&data->client->dev, "Error reading reg_int_rel\n");
>>> return ret;
>>> }
>>>
>>> @@ -183,7 +183,7 @@ static int kxcjk1013_chip_init(struct kxcjk1013_data *data)
>>> ret = i2c_smbus_write_byte_data(data->client, KXCJK1013_REG_CTRL1,
>>> ret);
>>> if (ret < 0) {
>>> - dev_err(&data->client->dev, "Error reading reg_ctrl\n");
>>> + dev_err(&data->client->dev, "Error writing reg_ctrl1\n");
>>> return ret;
>>> }
>>>
>>> @@ -337,7 +337,7 @@ static int kxcjk1013_get_acc_reg(struct kxcjk1013_data *data, int axis)
>>> ret = i2c_smbus_read_word_data(data->client, reg);
>>> if (ret < 0) {
>>> dev_err(&data->client->dev,
>>> - "failed to read accel_%c registers\n", 'x' + axis);
>>> + "failed to read accel_%c register\n", 'x' + axis);
>>> return ret;
>>> }
>>>
>>>
>> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
>>
>
> --
> 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] 10+ messages in thread
* [PATCH 2/3] iio:kxcjk-1013: Fix endianness in scan_type
2014-07-14 20:38 [PATCH 0/3] iio: accel driver fixes Peter Meerwald
2014-07-14 20:38 ` [PATCH 1/3] iio:kxcjk-1013: Correct error messages Peter Meerwald
@ 2014-07-14 20:38 ` Peter Meerwald
2014-07-15 18:46 ` Srinivas Pandruvada
2014-07-14 20:38 ` [PATCH 3/3] iio:bma180: Fix scale factors to report correct acceleration units Peter Meerwald
2 siblings, 1 reply; 10+ messages in thread
From: Peter Meerwald @ 2014-07-14 20:38 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, Peter Meerwald, Srinivas Pandruvada
driver uses i2c_smbus_read_word_data() to the data in the trigger handler and hence
already does endianness conversion; the I2C chip has data in little endian, but the
value is provides in CPU endianness
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
drivers/iio/accel/kxcjk-1013.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
index a11588c..ea96170 100644
--- a/drivers/iio/accel/kxcjk-1013.c
+++ b/drivers/iio/accel/kxcjk-1013.c
@@ -466,7 +466,7 @@ static const struct attribute_group kxcjk1013_attrs_group = {
.realbits = 12, \
.storagebits = 16, \
.shift = 4, \
- .endianness = IIO_LE, \
+ .endianness = IIO_CPU, \
}, \
}
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 2/3] iio:kxcjk-1013: Fix endianness in scan_type
2014-07-14 20:38 ` [PATCH 2/3] iio:kxcjk-1013: Fix endianness in scan_type Peter Meerwald
@ 2014-07-15 18:46 ` Srinivas Pandruvada
2014-07-20 16:53 ` Jonathan Cameron
0 siblings, 1 reply; 10+ messages in thread
From: Srinivas Pandruvada @ 2014-07-15 18:46 UTC (permalink / raw)
To: Peter Meerwald; +Cc: linux-iio, jic23
On 07/14/2014 01:38 PM, Peter Meerwald wrote:
> driver uses i2c_smbus_read_word_data() to the data in the trigger handler and hence
> already does endianness conversion; the I2C chip has data in little endian, but the
> value is provides in CPU endianness
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
> Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> ---
> drivers/iio/accel/kxcjk-1013.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
> index a11588c..ea96170 100644
> --- a/drivers/iio/accel/kxcjk-1013.c
> +++ b/drivers/iio/accel/kxcjk-1013.c
> @@ -466,7 +466,7 @@ static const struct attribute_group kxcjk1013_attrs_group = {
> .realbits = 12, \
> .storagebits = 16, \
> .shift = 4, \
> - .endianness = IIO_LE, \
> + .endianness = IIO_CPU, \
> }, \
> }
>
>
Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 2/3] iio:kxcjk-1013: Fix endianness in scan_type
2014-07-15 18:46 ` Srinivas Pandruvada
@ 2014-07-20 16:53 ` Jonathan Cameron
0 siblings, 0 replies; 10+ messages in thread
From: Jonathan Cameron @ 2014-07-20 16:53 UTC (permalink / raw)
To: Srinivas Pandruvada, Peter Meerwald; +Cc: linux-iio
On 15/07/14 19:46, Srinivas Pandruvada wrote:
> On 07/14/2014 01:38 PM, Peter Meerwald wrote:
>> driver uses i2c_smbus_read_word_data() to the data in the trigger handler and hence
>> already does endianness conversion; the I2C chip has data in little endian, but the
>> value is provides in CPU endianness
>>
>> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
>> Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Applied to the togreg branch of iio.git
Thanks,
>> ---
>> drivers/iio/accel/kxcjk-1013.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
>> index a11588c..ea96170 100644
>> --- a/drivers/iio/accel/kxcjk-1013.c
>> +++ b/drivers/iio/accel/kxcjk-1013.c
>> @@ -466,7 +466,7 @@ static const struct attribute_group kxcjk1013_attrs_group = {
>> .realbits = 12, \
>> .storagebits = 16, \
>> .shift = 4, \
>> - .endianness = IIO_LE, \
>> + .endianness = IIO_CPU, \
>> }, \
>> }
>>
>>
> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> --
> 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] 10+ messages in thread
* [PATCH 3/3] iio:bma180: Fix scale factors to report correct acceleration units
2014-07-14 20:38 [PATCH 0/3] iio: accel driver fixes Peter Meerwald
2014-07-14 20:38 ` [PATCH 1/3] iio:kxcjk-1013: Correct error messages Peter Meerwald
2014-07-14 20:38 ` [PATCH 2/3] iio:kxcjk-1013: Fix endianness in scan_type Peter Meerwald
@ 2014-07-14 20:38 ` Peter Meerwald
2014-07-15 6:54 ` Peter Meerwald
2 siblings, 1 reply; 10+ messages in thread
From: Peter Meerwald @ 2014-07-14 20:38 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, Peter Meerwald, Oleksandr Kravchenko
The userspace interface for acceleration sensors is documented as using
m/s^2 units [Documentation/ABI/testing/sysfs-bus-iio]
The fullscale raw values for the BMA80 corresponds to -/+ 1, 1.5, 2, etc G
depending on the selected mode.
The scale table was converting to G rather than m/s^2.
Change the scaling table to match the documented interface.
See commit 71702e6e, iio: mma8452: Use correct acceleration units,
for a related fix.
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
---
drivers/iio/accel/bma180.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index a7e68c8..b1c7ab4 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -74,7 +74,7 @@
#define BMA180_FLP_FREQ_AVAILABLE \
"10 20 40 75 150 300"
#define BMA180_SCALE_AVAILABLE \
- "0.000130 0.000190 0.000250 0.000380 0.000500 0.000990 0.001980"
+ "0.001275 0.001863 0.002452 0.003727 0.004903 0.009709 0.019417"
struct bma180_data {
struct i2c_client *client;
@@ -94,7 +94,7 @@ enum bma180_axis {
};
static int bw_table[] = { 10, 20, 40, 75, 150, 300 }; /* Hz */
-static int scale_table[] = { 130, 190, 250, 380, 500, 990, 1980 };
+static int scale_table[] = { 1275, 1863, 2452, 3727, 4903, 9709, 19417 };
static int bma180_get_acc_reg(struct bma180_data *data, enum bma180_axis axis)
{
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 3/3] iio:bma180: Fix scale factors to report correct acceleration units
2014-07-14 20:38 ` [PATCH 3/3] iio:bma180: Fix scale factors to report correct acceleration units Peter Meerwald
@ 2014-07-15 6:54 ` Peter Meerwald
0 siblings, 0 replies; 10+ messages in thread
From: Peter Meerwald @ 2014-07-15 6:54 UTC (permalink / raw)
To: linux-iio; +Cc: jic23, Oleksandr Kravchenko
the default value (250->2452) needs to be changed as well, I'll send an
updated patch
p.
> The userspace interface for acceleration sensors is documented as using
> m/s^2 units [Documentation/ABI/testing/sysfs-bus-iio]
>
> The fullscale raw values for the BMA80 corresponds to -/+ 1, 1.5, 2, etc G
> depending on the selected mode.
>
> The scale table was converting to G rather than m/s^2.
> Change the scaling table to match the documented interface.
>
> See commit 71702e6e, iio: mma8452: Use correct acceleration units,
> for a related fix.
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
> Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
> ---
> drivers/iio/accel/bma180.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
> index a7e68c8..b1c7ab4 100644
> --- a/drivers/iio/accel/bma180.c
> +++ b/drivers/iio/accel/bma180.c
> @@ -74,7 +74,7 @@
> #define BMA180_FLP_FREQ_AVAILABLE \
> "10 20 40 75 150 300"
> #define BMA180_SCALE_AVAILABLE \
> - "0.000130 0.000190 0.000250 0.000380 0.000500 0.000990 0.001980"
> + "0.001275 0.001863 0.002452 0.003727 0.004903 0.009709 0.019417"
>
> struct bma180_data {
> struct i2c_client *client;
> @@ -94,7 +94,7 @@ enum bma180_axis {
> };
>
> static int bw_table[] = { 10, 20, 40, 75, 150, 300 }; /* Hz */
> -static int scale_table[] = { 130, 190, 250, 380, 500, 990, 1980 };
> +static int scale_table[] = { 1275, 1863, 2452, 3727, 4903, 9709, 19417 };
>
> static int bma180_get_acc_reg(struct bma180_data *data, enum bma180_axis axis)
> {
>
--
Peter Meerwald
+43-664-2444418 (mobile)
^ permalink raw reply [flat|nested] 10+ messages in thread