* [PATCH v2 0/2] pixcir_i2c_ts: Add optional wakeup irq support
@ 2015-07-20 4:50 Vignesh R
2015-07-20 4:50 ` [PATCH v2 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt Vignesh R
2015-07-20 4:50 ` [PATCH v2 2/2] ARM: dts: AM437x-gp-evm: Add wakeup interrupt source for pixcir_i2c_tsc Vignesh R
0 siblings, 2 replies; 7+ messages in thread
From: Vignesh R @ 2015-07-20 4:50 UTC (permalink / raw)
To: linux-arm-kernel
On am437x-gp-evm, pixcir_i2c_tsc can wake-up system from low power
state via pinctrl and IO daisy chain mechanism. This patch series add
support for such optional wake up interrupt to be handled via recently
introduced generic wake irq handling framework.
Tested on am437x-gp-evm, with some out of tree patches to support
suspend/resume on am437x.
Vignesh R (2):
input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup
interrupt
ARM: dts: AM437x-gp-evm: Add wakeup interrupt source for
pixcir_i2c_tsc
arch/arm/boot/dts/am437x-gp-evm.dts | 4 ++++
drivers/input/touchscreen/pixcir_i2c_ts.c | 17 +++++++++++++----
include/linux/input/pixcir_ts.h | 1 +
3 files changed, 18 insertions(+), 4 deletions(-)
--
2.4.5
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v2 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt 2015-07-20 4:50 [PATCH v2 0/2] pixcir_i2c_ts: Add optional wakeup irq support Vignesh R @ 2015-07-20 4:50 ` Vignesh R 2015-07-20 6:09 ` Tony Lindgren 2015-07-20 6:25 ` Dmitry Torokhov 2015-07-20 4:50 ` [PATCH v2 2/2] ARM: dts: AM437x-gp-evm: Add wakeup interrupt source for pixcir_i2c_tsc Vignesh R 1 sibling, 2 replies; 7+ messages in thread From: Vignesh R @ 2015-07-20 4:50 UTC (permalink / raw) To: linux-arm-kernel 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 ? + 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 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt 2015-07-20 4:50 ` [PATCH v2 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt Vignesh R @ 2015-07-20 6:09 ` Tony Lindgren 2015-07-20 6:24 ` Dmitry Torokhov 2015-07-20 6:25 ` Dmitry Torokhov 1 sibling, 1 reply; 7+ messages in thread From: Tony Lindgren @ 2015-07-20 6:09 UTC (permalink / raw) To: linux-arm-kernel * 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt 2015-07-20 6:09 ` Tony Lindgren @ 2015-07-20 6:24 ` Dmitry Torokhov 2015-07-22 5:24 ` Vignesh R 0 siblings, 1 reply; 7+ messages in thread From: Dmitry Torokhov @ 2015-07-20 6:24 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt 2015-07-20 6:24 ` Dmitry Torokhov @ 2015-07-22 5:24 ` Vignesh R 0 siblings, 0 replies; 7+ messages in thread From: Vignesh R @ 2015-07-22 5:24 UTC (permalink / raw) To: linux-arm-kernel 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. > -- Regards Vignesh ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt 2015-07-20 4:50 ` [PATCH v2 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt Vignesh R 2015-07-20 6:09 ` Tony Lindgren @ 2015-07-20 6:25 ` Dmitry Torokhov 1 sibling, 0 replies; 7+ messages in thread From: Dmitry Torokhov @ 2015-07-20 6:25 UTC (permalink / raw) To: linux-arm-kernel 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 > -- Dmitry ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] ARM: dts: AM437x-gp-evm: Add wakeup interrupt source for pixcir_i2c_tsc 2015-07-20 4:50 [PATCH v2 0/2] pixcir_i2c_ts: Add optional wakeup irq support Vignesh R 2015-07-20 4:50 ` [PATCH v2 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt Vignesh R @ 2015-07-20 4:50 ` Vignesh R 1 sibling, 0 replies; 7+ messages in thread From: Vignesh R @ 2015-07-20 4:50 UTC (permalink / raw) To: linux-arm-kernel Pixcir_i2c_tsc driver can now wakeup the system from lower power state via pinctrl and IO daisy chain using generic wakeirq framwework. Add optional wakeup irq entry to allow pixcir_i2c_tsc to wake system from low power state. Signed-off-by: Vignesh R <vigneshr@ti.com> --- v2: * Add interrupt-names property arch/arm/boot/dts/am437x-gp-evm.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts index 84aa30c3235a..2184ac5426cd 100644 --- a/arch/arm/boot/dts/am437x-gp-evm.dts +++ b/arch/arm/boot/dts/am437x-gp-evm.dts @@ -503,6 +503,10 @@ attb-gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; + interrupts-extended = <&gpio3 22 GPIO_ACTIVE_HIGH>, + <&am43xx_pinmux 0x264>; + interrupt-names = "tscirq", "wakeupirq"; + touchscreen-size-x = <1024>; touchscreen-size-y = <600>; }; -- 2.4.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-07-22 5:24 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-07-20 4:50 [PATCH v2 0/2] pixcir_i2c_ts: Add optional wakeup irq support Vignesh R 2015-07-20 4:50 ` [PATCH v2 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt Vignesh R 2015-07-20 6:09 ` Tony Lindgren 2015-07-20 6:24 ` Dmitry Torokhov 2015-07-22 5:24 ` Vignesh R 2015-07-20 6:25 ` Dmitry Torokhov 2015-07-20 4:50 ` [PATCH v2 2/2] ARM: dts: AM437x-gp-evm: Add wakeup interrupt source for pixcir_i2c_tsc Vignesh R
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).