[v2,1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt
diff mbox

Message ID 1437367814-27785-2-git-send-email-vigneshr@ti.com
State New
Headers show

Commit Message

Vignesh Raghavendra July 20, 2015, 4:50 a.m. UTC
On am437x-gp-evm, pixcir touchscreen can wake the system from low power
state by generating wake-up interrupt via pinctrl and IO daisy chain.
Add support for optional wakeup interrupt source by regsitering to
automated wake IRQ framework introduced by commit 4990d4fe327b ("PM /
Wakeirq: Add automated device wake IRQ handling").
This is similar in approach to commit 2a0b965cfb6e ("serial: omap: Add
support for optional wake-up")

Signed-off-by: Vignesh R <vigneshr@ti.com>
---
v2:
 * use of_irq_get_byname()
 * remove enable/disable_wake_irq()

 drivers/input/touchscreen/pixcir_i2c_ts.c | 17 +++++++++++++----
 include/linux/input/pixcir_ts.h           |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

Comments

Tony Lindgren July 20, 2015, 6:09 a.m. UTC | #1
* Vignesh R <vigneshr@ti.com> [150719 21:53]:
> @@ -445,6 +443,8 @@ static struct pixcir_ts_platform_data *pixcir_parse_dt(struct device *dev)
>  	dev_dbg(dev, "%s: x %d, y %d, gpio %d\n", __func__,
>  		pdata->x_max + 1, pdata->y_max + 1, pdata->gpio_attb);
>  
> +	pdata->wakeirq = of_irq_get_byname(dev->of_node, "wakeupirq");
> +
>  	return pdata;

What about handling -EPROVE_DEFER here? At least pinctrl-single can be
be a loadable module for the dedicated wakeirqs.

Regarads,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov July 20, 2015, 6:24 a.m. UTC | #2
On Sun, Jul 19, 2015 at 11:09:30PM -0700, Tony Lindgren wrote:
> * Vignesh R <vigneshr@ti.com> [150719 21:53]:
> > @@ -445,6 +443,8 @@ static struct pixcir_ts_platform_data *pixcir_parse_dt(struct device *dev)
> >  	dev_dbg(dev, "%s: x %d, y %d, gpio %d\n", __func__,
> >  		pdata->x_max + 1, pdata->y_max + 1, pdata->gpio_attb);
> >  
> > +	pdata->wakeirq = of_irq_get_byname(dev->of_node, "wakeupirq");
> > +
> >  	return pdata;
> 
> What about handling -EPROVE_DEFER here? At least pinctrl-single can be
> be a loadable module for the dedicated wakeirqs.

Right. I think we should only allow -ENODATA to continue and return
error in all other cases.

Also, I think "irq" suffix on name is redundant.

Thanks.
Dmitry Torokhov July 20, 2015, 6:25 a.m. UTC | #3
On Mon, Jul 20, 2015 at 10:20:13AM +0530, Vignesh R wrote:
> On am437x-gp-evm, pixcir touchscreen can wake the system from low power
> state by generating wake-up interrupt via pinctrl and IO daisy chain.
> Add support for optional wakeup interrupt source by regsitering to
> automated wake IRQ framework introduced by commit 4990d4fe327b ("PM /
> Wakeirq: Add automated device wake IRQ handling").
> This is similar in approach to commit 2a0b965cfb6e ("serial: omap: Add
> support for optional wake-up")
> 
> Signed-off-by: Vignesh R <vigneshr@ti.com>
> ---
> v2:
>  * use of_irq_get_byname()
>  * remove enable/disable_wake_irq()
> 
>  drivers/input/touchscreen/pixcir_i2c_ts.c | 17 +++++++++++++----
>  include/linux/input/pixcir_ts.h           |  1 +
>  2 files changed, 14 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
> index 8f3e243a62bf..b9cebf274678 100644
> --- a/drivers/input/touchscreen/pixcir_i2c_ts.c
> +++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
> @@ -29,6 +29,8 @@
>  #include <linux/of.h>
>  #include <linux/of_gpio.h>
>  #include <linux/of_device.h>
> +#include <linux/of_irq.h>
> +#include <linux/pm_wakeirq.h>
>  
>  #define PIXCIR_MAX_SLOTS       5 /* Max fingers supported by driver */
>  
> @@ -364,8 +366,6 @@ static int __maybe_unused pixcir_i2c_ts_suspend(struct device *dev)
>  				goto unlock;
>  			}
>  		}
> -
> -		enable_irq_wake(client->irq);
>  	} else if (input->users) {
>  		ret = pixcir_stop(ts);
>  	}
> @@ -386,8 +386,6 @@ static int __maybe_unused pixcir_i2c_ts_resume(struct device *dev)
>  	mutex_lock(&input->mutex);
>  
>  	if (device_may_wakeup(&client->dev)) {
> -		disable_irq_wake(client->irq);
> -
>  		if (!input->users) {
>  			ret = pixcir_stop(ts);
>  			if (ret) {
> @@ -445,6 +443,8 @@ static struct pixcir_ts_platform_data *pixcir_parse_dt(struct device *dev)
>  	dev_dbg(dev, "%s: x %d, y %d, gpio %d\n", __func__,
>  		pdata->x_max + 1, pdata->y_max + 1, pdata->gpio_attb);
>  
> +	pdata->wakeirq = of_irq_get_byname(dev->of_node, "wakeupirq");
> +
>  	return pdata;
>  }
>  #else
> @@ -564,11 +564,20 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client,
>  	i2c_set_clientdata(client, tsdata);
>  	device_init_wakeup(&client->dev, 1);
>  
> +	/* Register wakeirq */
> +	error = pdata->wakeirq ?

Hmm, I guess the condition should be pdata->wakeirq > 0.

> +		dev_pm_set_dedicated_wake_irq(dev, pdata->wakeirq) :
> +		dev_pm_set_wake_irq(dev, client->irq);
> +	if (error)
> +		dev_info(dev, "unable to get wakeirq %d\n",
> +			 error);
> +
>  	return 0;
>  }
>  
>  static int pixcir_i2c_ts_remove(struct i2c_client *client)
>  {
> +	dev_pm_clear_wake_irq(&client->dev);
>  	device_init_wakeup(&client->dev, 0);
>  
>  	return 0;
> diff --git a/include/linux/input/pixcir_ts.h b/include/linux/input/pixcir_ts.h
> index 7bae83b7c396..da573de5a5ee 100644
> --- a/include/linux/input/pixcir_ts.h
> +++ b/include/linux/input/pixcir_ts.h
> @@ -58,6 +58,7 @@ struct pixcir_ts_platform_data {
>  	int x_max;
>  	int y_max;
>  	int gpio_attb;		/* GPIO connected to ATTB line */
> +	int wakeirq;
>  	struct pixcir_i2c_chip_data chip;
>  };
>  
> -- 
> 2.4.5
>
Vignesh Raghavendra July 22, 2015, 5:24 a.m. UTC | #4
Hi Dmitry,

On 07/20/2015 11:54 AM, Dmitry Torokhov wrote:
> On Sun, Jul 19, 2015 at 11:09:30PM -0700, Tony Lindgren wrote:
>> * Vignesh R <vigneshr@ti.com> [150719 21:53]:
>>> @@ -445,6 +443,8 @@ static struct pixcir_ts_platform_data *pixcir_parse_dt(struct device *dev)
>>>  	dev_dbg(dev, "%s: x %d, y %d, gpio %d\n", __func__,
>>>  		pdata->x_max + 1, pdata->y_max + 1, pdata->gpio_attb);
>>>  
>>> +	pdata->wakeirq = of_irq_get_byname(dev->of_node, "wakeupirq");
>>> +
>>>  	return pdata;
>>
>> What about handling -EPROVE_DEFER here? At least pinctrl-single can be
>> be a loadable module for the dedicated wakeirqs.
> 
> Right. I think we should only allow -ENODATA to continue and return
> error in all other cases.

-EINVAL will be returned if "interrupt-names" is not specified. I will
make execption for -ENODATA & -EINVAL, and return error in all other cases?

> 
> Also, I think "irq" suffix on name is redundant.

Ok, will drop "irq" suffix:

+		interrupt-names = "tsc", "wakeup";

> 
> Thanks.
>

Patch
diff mbox

diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
index 8f3e243a62bf..b9cebf274678 100644
--- a/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
@@ -29,6 +29,8 @@ 
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
+#include <linux/pm_wakeirq.h>
 
 #define PIXCIR_MAX_SLOTS       5 /* Max fingers supported by driver */
 
@@ -364,8 +366,6 @@  static int __maybe_unused pixcir_i2c_ts_suspend(struct device *dev)
 				goto unlock;
 			}
 		}
-
-		enable_irq_wake(client->irq);
 	} else if (input->users) {
 		ret = pixcir_stop(ts);
 	}
@@ -386,8 +386,6 @@  static int __maybe_unused pixcir_i2c_ts_resume(struct device *dev)
 	mutex_lock(&input->mutex);
 
 	if (device_may_wakeup(&client->dev)) {
-		disable_irq_wake(client->irq);
-
 		if (!input->users) {
 			ret = pixcir_stop(ts);
 			if (ret) {
@@ -445,6 +443,8 @@  static struct pixcir_ts_platform_data *pixcir_parse_dt(struct device *dev)
 	dev_dbg(dev, "%s: x %d, y %d, gpio %d\n", __func__,
 		pdata->x_max + 1, pdata->y_max + 1, pdata->gpio_attb);
 
+	pdata->wakeirq = of_irq_get_byname(dev->of_node, "wakeupirq");
+
 	return pdata;
 }
 #else
@@ -564,11 +564,20 @@  static int pixcir_i2c_ts_probe(struct i2c_client *client,
 	i2c_set_clientdata(client, tsdata);
 	device_init_wakeup(&client->dev, 1);
 
+	/* Register wakeirq */
+	error = pdata->wakeirq ?
+		dev_pm_set_dedicated_wake_irq(dev, pdata->wakeirq) :
+		dev_pm_set_wake_irq(dev, client->irq);
+	if (error)
+		dev_info(dev, "unable to get wakeirq %d\n",
+			 error);
+
 	return 0;
 }
 
 static int pixcir_i2c_ts_remove(struct i2c_client *client)
 {
+	dev_pm_clear_wake_irq(&client->dev);
 	device_init_wakeup(&client->dev, 0);
 
 	return 0;
diff --git a/include/linux/input/pixcir_ts.h b/include/linux/input/pixcir_ts.h
index 7bae83b7c396..da573de5a5ee 100644
--- a/include/linux/input/pixcir_ts.h
+++ b/include/linux/input/pixcir_ts.h
@@ -58,6 +58,7 @@  struct pixcir_ts_platform_data {
 	int x_max;
 	int y_max;
 	int gpio_attb;		/* GPIO connected to ATTB line */
+	int wakeirq;
 	struct pixcir_i2c_chip_data chip;
 };