From: Roger Quadros <rogerq@ti.com>
To: dmitry.torokhov@gmail.com
Cc: rydberg@euromail.se, jcbian@pixcir.com.cn, balbi@ti.com,
dmurphy@ti.com, mugunthanvnm@ti.com, linux-input@vger.kernel.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
Roger Quadros <rogerq@ti.com>
Subject: [PATCH v2 6/8] Input: pixcir_i2c_ts: Implement wakeup from suspend
Date: Wed, 26 Feb 2014 17:28:04 +0200 [thread overview]
Message-ID: <1393428486-15001-7-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1393428486-15001-1-git-send-email-rogerq@ti.com>
Improve the suspend and resume handlers to allow the device
to wakeup the system from suspend.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Acked-by: Mugunthan V N <mugunthanvnm@ti.com>
---
drivers/input/touchscreen/pixcir_i2c_ts.c | 46 ++++++++++++++++++++++++++++---
1 file changed, 42 insertions(+), 4 deletions(-)
diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
index b1e92f6..8ca258b 100644
--- a/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
@@ -345,21 +345,59 @@ static void pixcir_input_close(struct input_dev *dev)
static int pixcir_i2c_ts_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
+ struct pixcir_i2c_ts_data *ts = i2c_get_clientdata(client);
+ struct input_dev *input = ts->input;
+ int ret = 0;
+
+ mutex_lock(&input->mutex);
+
+ if (device_may_wakeup(&client->dev)) {
+ /* need to start device if not open, to be wakeup source */
+ if (!input->users) {
+ ret = pixcir_start(ts);
+ if (ret)
+ goto unlock;
+ }
- if (device_may_wakeup(&client->dev))
enable_irq_wake(client->irq);
- return 0;
+ } else if (input->users) {
+ ret = pixcir_stop(ts);
+ }
+
+unlock:
+ mutex_unlock(&input->mutex);
+
+ return ret;
}
static int pixcir_i2c_ts_resume(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
+ struct pixcir_i2c_ts_data *ts = i2c_get_clientdata(client);
+ struct input_dev *input = ts->input;
+ int ret = 0;
+
+ mutex_lock(&input->mutex);
- if (device_may_wakeup(&client->dev))
+ if (device_may_wakeup(&client->dev)) {
disable_irq_wake(client->irq);
- return 0;
+ /* need to stop device if it was not open on suspend */
+ if (!input->users) {
+ ret = pixcir_stop(ts);
+ if (ret)
+ goto unlock;
+ }
+
+ } else if (input->users) {
+ ret = pixcir_start(ts);
+ }
+
+unlock:
+ mutex_unlock(&input->mutex);
+
+ return ret;
}
#endif
--
1.8.3.2
next prev parent reply other threads:[~2014-02-26 15:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-26 15:27 [PATCH v2 0/8] Input: pixcir_i2c_ts: Add Type-B Multi-touch and DT support Roger Quadros
2014-02-26 15:27 ` [PATCH v2 1/8] Input: pixcir_i2c_ts: Use devres managed resource allocations Roger Quadros
2014-02-26 15:28 ` [PATCH v2 2/8] Input: pixcir_i2c_ts: Initialize interrupt mode and power mode Roger Quadros
2014-02-26 15:28 ` [PATCH v2 3/8] Input: pixcir_i2c_ts: Get rid of pdata->attb_read_val() Roger Quadros
2014-02-26 15:41 ` Felipe Balbi
[not found] ` <1393428486-15001-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2014-02-26 15:28 ` [PATCH v2 4/8] Input: pixcir_i2c_ts: Use Type-B Multi-Touch protocol Roger Quadros
2014-03-08 15:11 ` Henrik Rydberg
2014-03-10 8:57 ` Roger Quadros
2014-03-10 16:37 ` Felipe Balbi
2014-03-11 9:35 ` Roger Quadros
2014-03-19 11:27 ` Roger Quadros
2014-02-26 15:28 ` [PATCH v2 5/8] Input: pixcir_i2c_ts: support upto 5 fingers and hardware provided tracking IDs Roger Quadros
2014-02-26 15:28 ` Roger Quadros [this message]
2014-02-26 15:28 ` [PATCH v2 7/8] Input: pixcir_i2c_ts: Add device tree support Roger Quadros
2014-02-26 15:28 ` [PATCH v2 8/8] ARM: dts: am43x-epos-evm: Correct Touch controller info Roger Quadros
2014-03-04 11:24 ` [PATCH v2 0/8] Input: pixcir_i2c_ts: Add Type-B Multi-touch and DT support Roger Quadros
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=1393428486-15001-7-git-send-email-rogerq@ti.com \
--to=rogerq@ti.com \
--cc=balbi@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=dmurphy@ti.com \
--cc=jcbian@pixcir.com.cn \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mugunthanvnm@ti.com \
--cc=rydberg@euromail.se \
/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).