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 v3 6/7] Input: pixcir_i2c_ts: Implement wakeup from suspend Date: Wed, 30 Apr 2014 15:36:31 +0300 [thread overview] Message-ID: <1398861392-8959-7-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1398861392-8959-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 | 53 ++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c index b3ff62c..ea31e20 100644 --- a/drivers/input/touchscreen/pixcir_i2c_ts.c +++ b/drivers/input/touchscreen/pixcir_i2c_ts.c @@ -352,21 +352,66 @@ 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 (input->users) { + ret = pixcir_stop(ts); + if (ret) + goto unlock; + } + + /* + * If wakeup is enabled we need to enable interrupt generation + * but don't need to process any reports i.e. ts->exiting must be true. + */ + if (device_may_wakeup(&client->dev)) { + /* enable wakeup interrupt generation */ + ret = pixcir_int_enable(ts, 1); + if (ret) { + dev_err(dev, "Failed to enable interrupt generation\n"); + goto unlock; + } - if (device_may_wakeup(&client->dev)) enable_irq_wake(client->irq); + } - 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; - if (device_may_wakeup(&client->dev)) + mutex_lock(&input->mutex); + + if (device_may_wakeup(&client->dev)) { disable_irq_wake(client->irq); - return 0; + /* disable wakeup interrupt generation */ + ret = pixcir_int_enable(ts, 0); + if (ret) { + dev_err(dev, "Failed to disable interrupt generation\n"); + goto unlock; + } + } + + if (input->users) + ret = pixcir_start(ts); + +unlock: + mutex_unlock(&input->mutex); + + return ret; } #endif -- 1.8.3.2
WARNING: multiple messages have this Message-ID (diff)
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 v3 6/7] Input: pixcir_i2c_ts: Implement wakeup from suspend Date: Wed, 30 Apr 2014 15:36:31 +0300 [thread overview] Message-ID: <1398861392-8959-7-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1398861392-8959-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 | 53 ++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c index b3ff62c..ea31e20 100644 --- a/drivers/input/touchscreen/pixcir_i2c_ts.c +++ b/drivers/input/touchscreen/pixcir_i2c_ts.c @@ -352,21 +352,66 @@ 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 (input->users) { + ret = pixcir_stop(ts); + if (ret) + goto unlock; + } + + /* + * If wakeup is enabled we need to enable interrupt generation + * but don't need to process any reports i.e. ts->exiting must be true. + */ + if (device_may_wakeup(&client->dev)) { + /* enable wakeup interrupt generation */ + ret = pixcir_int_enable(ts, 1); + if (ret) { + dev_err(dev, "Failed to enable interrupt generation\n"); + goto unlock; + } - if (device_may_wakeup(&client->dev)) enable_irq_wake(client->irq); + } - 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; - if (device_may_wakeup(&client->dev)) + mutex_lock(&input->mutex); + + if (device_may_wakeup(&client->dev)) { disable_irq_wake(client->irq); - return 0; + /* disable wakeup interrupt generation */ + ret = pixcir_int_enable(ts, 0); + if (ret) { + dev_err(dev, "Failed to disable interrupt generation\n"); + goto unlock; + } + } + + 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-04-30 12:37 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-04-30 12:36 [PATCH v3 0/7] Input: pixcir_i2c_ts: Add Type-B Multi-touch and DT support Roger Quadros 2014-04-30 12:36 ` Roger Quadros 2014-04-30 12:36 ` [PATCH v3 1/7] Input: pixcir_i2c_ts: Use devres managed resource allocations Roger Quadros 2014-04-30 12:36 ` Roger Quadros 2014-04-30 16:30 ` Dmitry Torokhov 2014-04-30 16:30 ` Dmitry Torokhov 2014-05-05 8:44 ` Roger Quadros 2014-05-05 8:44 ` Roger Quadros 2014-04-30 12:36 ` [PATCH v3 2/7] Input: pixcir_i2c_ts: Initialize interrupt mode and power mode Roger Quadros 2014-04-30 12:36 ` Roger Quadros 2014-04-30 16:29 ` Dmitry Torokhov 2014-05-05 8:42 ` Roger Quadros 2014-05-05 8:42 ` Roger Quadros 2014-04-30 12:36 ` [PATCH v3 3/7] Input: pixcir_i2c_ts: Get rid of pdata->attb_read_val() Roger Quadros 2014-04-30 12:36 ` Roger Quadros 2014-04-30 12:36 ` [PATCH v3 4/7] Input: pixcir_i2c_ts: Use Type-B Multi-Touch protocol Roger Quadros 2014-04-30 12:36 ` Roger Quadros 2014-04-30 12:36 ` [PATCH v3 5/7] Input: pixcir_i2c_ts: support upto 5 fingers and hardware provided tracking IDs Roger Quadros 2014-04-30 12:36 ` Roger Quadros 2014-04-30 12:36 ` Roger Quadros [this message] 2014-04-30 12:36 ` [PATCH v3 6/7] Input: pixcir_i2c_ts: Implement wakeup from suspend Roger Quadros 2014-04-30 12:36 ` [PATCH v3 7/7] Input: pixcir_i2c_ts: Add device tree support Roger Quadros 2014-04-30 12:36 ` 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=1398861392-8959-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.