* [PATCH v1 1/4] iio: gyro: bmg160: Error handling when mode set fails
2014-10-11 3:33 [PATCH v1 0/4] BMG160 updates Srinivas Pandruvada
@ 2014-10-11 3:33 ` Srinivas Pandruvada
2014-11-16 20:19 ` Jonathan Cameron
2014-10-11 3:33 ` [PATCH v1 2/4] iio: gyro: bmg160: Don't let interrupt mode to be open drain Srinivas Pandruvada
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Srinivas Pandruvada @ 2014-10-11 3:33 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, Srinivas Pandruvada
When mode set fails due to some transient failures, it will atleast
reset the state of runtime usage count and also let the runtime
suspend retry from the driver framework.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
drivers/iio/gyro/bmg160.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c
index 1f967e0d..22bf9db 100644
--- a/drivers/iio/gyro/bmg160.c
+++ b/drivers/iio/gyro/bmg160.c
@@ -250,6 +250,9 @@ static int bmg160_set_power_state(struct bmg160_data *data, bool on)
if (ret < 0) {
dev_err(&data->client->dev,
"Failed: bmg160_set_power_state for %d\n", on);
+ if (on)
+ pm_runtime_put_noidle(&data->client->dev);
+
return ret;
}
#endif
@@ -705,6 +708,7 @@ static int bmg160_write_event_config(struct iio_dev *indio_dev,
ret = bmg160_setup_any_motion_interrupt(data, state);
if (ret < 0) {
+ bmg160_set_power_state(data, false);
mutex_unlock(&data->mutex);
return ret;
}
@@ -871,6 +875,7 @@ static int bmg160_data_rdy_trigger_set_state(struct iio_trigger *trig,
else
ret = bmg160_setup_new_data_interrupt(data, state);
if (ret < 0) {
+ bmg160_set_power_state(data, false);
mutex_unlock(&data->mutex);
return ret;
}
@@ -1169,8 +1174,15 @@ static int bmg160_runtime_suspend(struct device *dev)
{
struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
struct bmg160_data *data = iio_priv(indio_dev);
+ int ret;
- return bmg160_set_mode(data, BMG160_MODE_SUSPEND);
+ ret = bmg160_set_mode(data, BMG160_MODE_SUSPEND);
+ if (ret < 0) {
+ dev_err(&data->client->dev, "set mode failed\n");
+ return -EAGAIN;
+ }
+
+ return 0;
}
static int bmg160_runtime_resume(struct device *dev)
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v1 1/4] iio: gyro: bmg160: Error handling when mode set fails
2014-10-11 3:33 ` [PATCH v1 1/4] iio: gyro: bmg160: Error handling when mode set fails Srinivas Pandruvada
@ 2014-11-16 20:19 ` Jonathan Cameron
0 siblings, 0 replies; 9+ messages in thread
From: Jonathan Cameron @ 2014-11-16 20:19 UTC (permalink / raw)
To: Srinivas Pandruvada; +Cc: linux-iio
On 11/10/14 04:33, Srinivas Pandruvada wrote:
> When mode set fails due to some transient failures, it will atleast
> reset the state of runtime usage count and also let the runtime
> suspend retry from the driver framework.
>
> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Applied to the fixes-togreg branch of iio.git.
Thanks,
> ---
> drivers/iio/gyro/bmg160.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c
> index 1f967e0d..22bf9db 100644
> --- a/drivers/iio/gyro/bmg160.c
> +++ b/drivers/iio/gyro/bmg160.c
> @@ -250,6 +250,9 @@ static int bmg160_set_power_state(struct bmg160_data *data, bool on)
> if (ret < 0) {
> dev_err(&data->client->dev,
> "Failed: bmg160_set_power_state for %d\n", on);
> + if (on)
> + pm_runtime_put_noidle(&data->client->dev);
> +
> return ret;
> }
> #endif
> @@ -705,6 +708,7 @@ static int bmg160_write_event_config(struct iio_dev *indio_dev,
>
> ret = bmg160_setup_any_motion_interrupt(data, state);
> if (ret < 0) {
> + bmg160_set_power_state(data, false);
> mutex_unlock(&data->mutex);
> return ret;
> }
> @@ -871,6 +875,7 @@ static int bmg160_data_rdy_trigger_set_state(struct iio_trigger *trig,
> else
> ret = bmg160_setup_new_data_interrupt(data, state);
> if (ret < 0) {
> + bmg160_set_power_state(data, false);
> mutex_unlock(&data->mutex);
> return ret;
> }
> @@ -1169,8 +1174,15 @@ static int bmg160_runtime_suspend(struct device *dev)
> {
> struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
> struct bmg160_data *data = iio_priv(indio_dev);
> + int ret;
>
> - return bmg160_set_mode(data, BMG160_MODE_SUSPEND);
> + ret = bmg160_set_mode(data, BMG160_MODE_SUSPEND);
> + if (ret < 0) {
> + dev_err(&data->client->dev, "set mode failed\n");
> + return -EAGAIN;
> + }
> +
> + return 0;
> }
>
> static int bmg160_runtime_resume(struct device *dev)
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v1 2/4] iio: gyro: bmg160: Don't let interrupt mode to be open drain
2014-10-11 3:33 [PATCH v1 0/4] BMG160 updates Srinivas Pandruvada
2014-10-11 3:33 ` [PATCH v1 1/4] iio: gyro: bmg160: Error handling when mode set fails Srinivas Pandruvada
@ 2014-10-11 3:33 ` Srinivas Pandruvada
2014-11-16 20:20 ` Jonathan Cameron
2014-10-11 3:33 ` [PATCH v1 3/4] iio: gyro: bmg160: Send x, y and z motion separately Srinivas Pandruvada
2014-10-11 3:33 ` [PATCH v1 4/4] iio: gyro: bmg160: Fix iio_event_spec direction Srinivas Pandruvada
3 siblings, 1 reply; 9+ messages in thread
From: Srinivas Pandruvada @ 2014-10-11 3:33 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, Srinivas Pandruvada
Change the mode to push/pull type instead of open drain as some
platforms fails to drive the GPIO pin with open drain.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
drivers/iio/gyro/bmg160.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c
index 22bf9db..fa2e376 100644
--- a/drivers/iio/gyro/bmg160.c
+++ b/drivers/iio/gyro/bmg160.c
@@ -67,6 +67,9 @@
#define BMG160_REG_INT_EN_0 0x15
#define BMG160_DATA_ENABLE_INT BIT(7)
+#define BMG160_REG_INT_EN_1 0x16
+#define BMG160_INT1_BIT_OD BIT(1)
+
#define BMG160_REG_XOUT_L 0x02
#define BMG160_AXIS_TO_REG(axis) (BMG160_REG_XOUT_L + (axis * 2))
@@ -222,6 +225,19 @@ static int bmg160_chip_init(struct bmg160_data *data)
data->slope_thres = ret;
/* Set default interrupt mode */
+ ret = i2c_smbus_read_byte_data(data->client, BMG160_REG_INT_EN_1);
+ if (ret < 0) {
+ dev_err(&data->client->dev, "Error reading reg_int_en_1\n");
+ return ret;
+ }
+ ret &= ~BMG160_INT1_BIT_OD;
+ ret = i2c_smbus_write_byte_data(data->client,
+ BMG160_REG_INT_EN_1, ret);
+ if (ret < 0) {
+ dev_err(&data->client->dev, "Error writing reg_int_en_1\n");
+ return ret;
+ }
+
ret = i2c_smbus_write_byte_data(data->client,
BMG160_REG_INT_RST_LATCH,
BMG160_INT_MODE_LATCH_INT |
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v1 2/4] iio: gyro: bmg160: Don't let interrupt mode to be open drain
2014-10-11 3:33 ` [PATCH v1 2/4] iio: gyro: bmg160: Don't let interrupt mode to be open drain Srinivas Pandruvada
@ 2014-11-16 20:20 ` Jonathan Cameron
0 siblings, 0 replies; 9+ messages in thread
From: Jonathan Cameron @ 2014-11-16 20:20 UTC (permalink / raw)
To: Srinivas Pandruvada; +Cc: linux-iio
On 11/10/14 04:33, Srinivas Pandruvada wrote:
> Change the mode to push/pull type instead of open drain as some
> platforms fails to drive the GPIO pin with open drain.
>
> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Applied to the fixes-togreg branch of iio.git
Ultimately this might want to be configurable via device tree
or similar, but fair enough for now...
> ---
> drivers/iio/gyro/bmg160.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c
> index 22bf9db..fa2e376 100644
> --- a/drivers/iio/gyro/bmg160.c
> +++ b/drivers/iio/gyro/bmg160.c
> @@ -67,6 +67,9 @@
> #define BMG160_REG_INT_EN_0 0x15
> #define BMG160_DATA_ENABLE_INT BIT(7)
>
> +#define BMG160_REG_INT_EN_1 0x16
> +#define BMG160_INT1_BIT_OD BIT(1)
> +
> #define BMG160_REG_XOUT_L 0x02
> #define BMG160_AXIS_TO_REG(axis) (BMG160_REG_XOUT_L + (axis * 2))
>
> @@ -222,6 +225,19 @@ static int bmg160_chip_init(struct bmg160_data *data)
> data->slope_thres = ret;
>
> /* Set default interrupt mode */
> + ret = i2c_smbus_read_byte_data(data->client, BMG160_REG_INT_EN_1);
> + if (ret < 0) {
> + dev_err(&data->client->dev, "Error reading reg_int_en_1\n");
> + return ret;
> + }
> + ret &= ~BMG160_INT1_BIT_OD;
> + ret = i2c_smbus_write_byte_data(data->client,
> + BMG160_REG_INT_EN_1, ret);
> + if (ret < 0) {
> + dev_err(&data->client->dev, "Error writing reg_int_en_1\n");
> + return ret;
> + }
> +
> ret = i2c_smbus_write_byte_data(data->client,
> BMG160_REG_INT_RST_LATCH,
> BMG160_INT_MODE_LATCH_INT |
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v1 3/4] iio: gyro: bmg160: Send x, y and z motion separately
2014-10-11 3:33 [PATCH v1 0/4] BMG160 updates Srinivas Pandruvada
2014-10-11 3:33 ` [PATCH v1 1/4] iio: gyro: bmg160: Error handling when mode set fails Srinivas Pandruvada
2014-10-11 3:33 ` [PATCH v1 2/4] iio: gyro: bmg160: Don't let interrupt mode to be open drain Srinivas Pandruvada
@ 2014-10-11 3:33 ` Srinivas Pandruvada
2014-11-16 20:21 ` Jonathan Cameron
2014-10-11 3:33 ` [PATCH v1 4/4] iio: gyro: bmg160: Fix iio_event_spec direction Srinivas Pandruvada
3 siblings, 1 reply; 9+ messages in thread
From: Srinivas Pandruvada @ 2014-10-11 3:33 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, Srinivas Pandruvada
This chip is capable to identify motion across x, y and z axes. So
send different events.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
drivers/iio/gyro/bmg160.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c
index fa2e376..9f751d6 100644
--- a/drivers/iio/gyro/bmg160.c
+++ b/drivers/iio/gyro/bmg160.c
@@ -85,6 +85,9 @@
#define BMG160_REG_INT_STATUS_2 0x0B
#define BMG160_ANY_MOTION_MASK 0x07
+#define BMG160_ANY_MOTION_BIT_X BIT(0)
+#define BMG160_ANY_MOTION_BIT_Y BIT(1)
+#define BMG160_ANY_MOTION_BIT_Z BIT(2)
#define BMG160_REG_TEMP 0x08
#define BMG160_TEMP_CENTER_VAL 23
@@ -929,10 +932,24 @@ static irqreturn_t bmg160_event_handler(int irq, void *private)
else
dir = IIO_EV_DIR_FALLING;
- if (ret & BMG160_ANY_MOTION_MASK)
+ if (ret & BMG160_ANY_MOTION_BIT_X)
iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL,
0,
- IIO_MOD_X_OR_Y_OR_Z,
+ IIO_MOD_X,
+ IIO_EV_TYPE_ROC,
+ dir),
+ data->timestamp);
+ if (ret & BMG160_ANY_MOTION_BIT_Y)
+ iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL,
+ 0,
+ IIO_MOD_Y,
+ IIO_EV_TYPE_ROC,
+ dir),
+ data->timestamp);
+ if (ret & BMG160_ANY_MOTION_BIT_Z)
+ iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL,
+ 0,
+ IIO_MOD_Z,
IIO_EV_TYPE_ROC,
dir),
data->timestamp);
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v1 3/4] iio: gyro: bmg160: Send x, y and z motion separately
2014-10-11 3:33 ` [PATCH v1 3/4] iio: gyro: bmg160: Send x, y and z motion separately Srinivas Pandruvada
@ 2014-11-16 20:21 ` Jonathan Cameron
0 siblings, 0 replies; 9+ messages in thread
From: Jonathan Cameron @ 2014-11-16 20:21 UTC (permalink / raw)
To: Srinivas Pandruvada; +Cc: linux-iio
On 11/10/14 04:33, Srinivas Pandruvada wrote:
> This chip is capable to identify motion across x, y and z axes. So
> send different events.
>
> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Taking the view this is an ABI 'fix' and applying it to the fixes-togreg branch
of iio.git
Thanks
Jonathan
> ---
> drivers/iio/gyro/bmg160.c | 21 +++++++++++++++++++--
> 1 file changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c
> index fa2e376..9f751d6 100644
> --- a/drivers/iio/gyro/bmg160.c
> +++ b/drivers/iio/gyro/bmg160.c
> @@ -85,6 +85,9 @@
>
> #define BMG160_REG_INT_STATUS_2 0x0B
> #define BMG160_ANY_MOTION_MASK 0x07
> +#define BMG160_ANY_MOTION_BIT_X BIT(0)
> +#define BMG160_ANY_MOTION_BIT_Y BIT(1)
> +#define BMG160_ANY_MOTION_BIT_Z BIT(2)
>
> #define BMG160_REG_TEMP 0x08
> #define BMG160_TEMP_CENTER_VAL 23
> @@ -929,10 +932,24 @@ static irqreturn_t bmg160_event_handler(int irq, void *private)
> else
> dir = IIO_EV_DIR_FALLING;
>
> - if (ret & BMG160_ANY_MOTION_MASK)
> + if (ret & BMG160_ANY_MOTION_BIT_X)
> iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL,
> 0,
> - IIO_MOD_X_OR_Y_OR_Z,
> + IIO_MOD_X,
> + IIO_EV_TYPE_ROC,
> + dir),
> + data->timestamp);
> + if (ret & BMG160_ANY_MOTION_BIT_Y)
> + iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL,
> + 0,
> + IIO_MOD_Y,
> + IIO_EV_TYPE_ROC,
> + dir),
> + data->timestamp);
> + if (ret & BMG160_ANY_MOTION_BIT_Z)
> + iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL,
> + 0,
> + IIO_MOD_Z,
> IIO_EV_TYPE_ROC,
> dir),
> data->timestamp);
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v1 4/4] iio: gyro: bmg160: Fix iio_event_spec direction
2014-10-11 3:33 [PATCH v1 0/4] BMG160 updates Srinivas Pandruvada
` (2 preceding siblings ...)
2014-10-11 3:33 ` [PATCH v1 3/4] iio: gyro: bmg160: Send x, y and z motion separately Srinivas Pandruvada
@ 2014-10-11 3:33 ` Srinivas Pandruvada
2014-11-16 20:21 ` Jonathan Cameron
3 siblings, 1 reply; 9+ messages in thread
From: Srinivas Pandruvada @ 2014-10-11 3:33 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, Srinivas Pandruvada
Change event spec direction from
IIO_EV_DIR_RISING | IIO_EV_DIR_FALLING
to
IIO_EV_DIR_EITHER
Suggested-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
drivers/iio/gyro/bmg160.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c
index 9f751d6..d2fa526 100644
--- a/drivers/iio/gyro/bmg160.c
+++ b/drivers/iio/gyro/bmg160.c
@@ -766,7 +766,7 @@ static const struct attribute_group bmg160_attrs_group = {
static const struct iio_event_spec bmg160_event = {
.type = IIO_EV_TYPE_ROC,
- .dir = IIO_EV_DIR_RISING | IIO_EV_DIR_FALLING,
+ .dir = IIO_EV_DIR_EITHER,
.mask_shared_by_type = BIT(IIO_EV_INFO_VALUE) |
BIT(IIO_EV_INFO_ENABLE)
};
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v1 4/4] iio: gyro: bmg160: Fix iio_event_spec direction
2014-10-11 3:33 ` [PATCH v1 4/4] iio: gyro: bmg160: Fix iio_event_spec direction Srinivas Pandruvada
@ 2014-11-16 20:21 ` Jonathan Cameron
0 siblings, 0 replies; 9+ messages in thread
From: Jonathan Cameron @ 2014-11-16 20:21 UTC (permalink / raw)
To: Srinivas Pandruvada; +Cc: linux-iio
On 11/10/14 04:33, Srinivas Pandruvada wrote:
> Change event spec direction from
> IIO_EV_DIR_RISING | IIO_EV_DIR_FALLING
> to
> IIO_EV_DIR_EITHER
>
> Suggested-by: Daniel Baluta <daniel.baluta@intel.com>
> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Applied to the fixes-togreg branch of iio.git.
Thanks,
Jonathan
> ---
> drivers/iio/gyro/bmg160.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c
> index 9f751d6..d2fa526 100644
> --- a/drivers/iio/gyro/bmg160.c
> +++ b/drivers/iio/gyro/bmg160.c
> @@ -766,7 +766,7 @@ static const struct attribute_group bmg160_attrs_group = {
>
> static const struct iio_event_spec bmg160_event = {
> .type = IIO_EV_TYPE_ROC,
> - .dir = IIO_EV_DIR_RISING | IIO_EV_DIR_FALLING,
> + .dir = IIO_EV_DIR_EITHER,
> .mask_shared_by_type = BIT(IIO_EV_INFO_VALUE) |
> BIT(IIO_EV_INFO_ENABLE)
> };
>
^ permalink raw reply [flat|nested] 9+ messages in thread