linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Roger Quadros <rogerq@ti.com>
To: dmitry.torokhov@gmail.com
Cc: rydberg@euromail.se, balbi@ti.com, dmurphy@ti.com,
	mugunthanvnm@ti.com, nsekhar@ti.com, linux-input@vger.kernel.org,
	linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
	Roger Quadros <rogerq@ti.com>
Subject: [PATCH v5 6/7] Input: pixcir_i2c_ts: Implement wakeup from suspend
Date: Tue, 6 May 2014 14:06:11 +0300	[thread overview]
Message-ID: <1399374372-29123-7-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1399374372-29123-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 | 47 ++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
index 0728c04..b0f7680 100644
--- a/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
@@ -348,21 +348,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)) {
+		if (!input->users) {
+			ret = pixcir_start(ts);
+			if (ret) {
+				dev_err(dev, "Failed to start\n");
+				goto unlock;
+			}
+		}
 
-	if (device_may_wakeup(&client->dev))
 		enable_irq_wake(client->irq);
+	} else if (input->users) {
+		ret = pixcir_stop(ts);
+	}
 
-	return 0;
+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;
+		if (!input->users) {
+			ret = pixcir_stop(ts);
+			if (ret) {
+				dev_err(dev, "Failed to stop\n");
+				goto unlock;
+			}
+		}
+	} else if (input->users) {
+		ret = pixcir_start(ts);
+	}
+
+unlock:
+	mutex_unlock(&input->mutex);
+
+	return ret;
 }
 #endif
 
@@ -469,6 +507,7 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client,
 	if (error)
 		return error;
 
+	i2c_set_clientdata(client, tsdata);
 	device_init_wakeup(&client->dev, 1);
 
 	return 0;
-- 
1.8.3.2

  parent reply	other threads:[~2014-05-06 11:06 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-06 11:06 [PATCH v5 0/7] Input: pixcir_i2c_ts: Add Type-B Multi-touch and DT support Roger Quadros
2014-05-06 11:06 ` [PATCH v5 1/7] Input: pixcir_i2c_ts: Use devres managed resource allocations Roger Quadros
2014-05-19  5:54   ` Dmitry Torokhov
2014-05-06 11:06 ` [PATCH v5 3/7] Input: pixcir_i2c_ts: Get rid of pdata->attb_read_val() Roger Quadros
2014-05-19  5:55   ` Dmitry Torokhov
2014-05-06 11:06 ` [PATCH v5 4/7] Input: pixcir_i2c_ts: Use Type-B Multi-Touch protocol Roger Quadros
2014-05-19  5:54   ` Dmitry Torokhov
2014-05-19  7:04   ` Henrik Rydberg
     [not found]     ` <5379ACF1.6080305-Hk7bIW8heu4wFerOooGFRg@public.gmane.org>
2014-05-19  7:42       ` Roger Quadros
     [not found]   ` <1399374372-29123-5-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2014-05-19  8:24     ` [PATCH v6 " Roger Quadros
2014-06-04  8:53       ` Roger Quadros
     [not found] ` <1399374372-29123-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2014-05-06 11:06   ` [PATCH v5 2/7] Input: pixcir_i2c_ts - initialize interrupt mode and power mode Roger Quadros
2014-05-19  5:55     ` Dmitry Torokhov
2014-05-06 11:06   ` [PATCH v5 5/7] Input: pixcir_i2c_ts: support upto 5 fingers and hardware provided tracking IDs Roger Quadros
2014-05-19  8:26     ` [PATCH v6 " Roger Quadros
2014-05-06 11:06 ` Roger Quadros [this message]
2014-05-19  5:55   ` [PATCH v5 6/7] Input: pixcir_i2c_ts: Implement wakeup from suspend Dmitry Torokhov
2014-05-06 11:06 ` [PATCH v5 7/7] Input: pixcir_i2c_ts: Add device tree support Roger Quadros
2014-05-19  5:54   ` Dmitry Torokhov
2014-05-19  7:50     ` Roger Quadros
2014-05-19  8:27   ` [PATCH v6 " 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=1399374372-29123-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=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mugunthanvnm@ti.com \
    --cc=nsekhar@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).