* [PATCH v3 0/2] pixcir_i2c_ts: Add optional wakeup irq support @ 2015-07-23 14:54 Vignesh R 2015-07-23 14:54 ` [PATCH v3 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt Vignesh R 2015-07-23 14:54 ` [PATCH v3 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-23 14:54 UTC (permalink / raw) To: Dmitry Torokhov, Tony Lindgren, Benoit Cousson, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King Cc: Roger Quadros, Henrik Rydberg, Frodo Lai, Jingoo Han, linux-omap, devicetree, linux-arm-kernel, linux-kernel, linux-input, Vignesh R This is the v3 of the patch series to add optional wake irq support for pixcir_i2c_tsc. 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 | 22 ++++++++++++++++++---- include/linux/input/pixcir_ts.h | 1 + 3 files changed, 23 insertions(+), 4 deletions(-) -- 2.4.5 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt 2015-07-23 14:54 [PATCH v3 0/2] pixcir_i2c_ts: Add optional wakeup irq support Vignesh R @ 2015-07-23 14:54 ` Vignesh R 2015-07-27 10:49 ` Roger Quadros 2015-07-23 14:54 ` [PATCH v3 2/2] ARM: dts: am437x-gp-evm: Add wakeup interrupt source for pixcir_i2c_tsc Vignesh R 1 sibling, 1 reply; 7+ messages in thread From: Vignesh R @ 2015-07-23 14:54 UTC (permalink / raw) To: Dmitry Torokhov, Tony Lindgren, Benoit Cousson, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King Cc: Roger Quadros, Henrik Rydberg, Frodo Lai, Jingoo Han, linux-omap, devicetree, linux-arm-kernel, linux-kernel, linux-input, Vignesh R 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> --- v3: * handle error code returned by of_irq_get_byname() v2: * use of_irq_get_byname() * remove enable/disable_wake_irq() drivers/input/touchscreen/pixcir_i2c_ts.c | 22 ++++++++++++++++++---- include/linux/input/pixcir_ts.h | 1 + 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c index 8f3e243a62bf..3a4ab358bf52 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,13 @@ 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, "wakeup"); + if (pdata->wakeirq < 0 && pdata->wakeirq != -ENODATA && + pdata->wakeirq != -EINVAL) { + dev_err(dev, "Failed to get wakeirq\n"); + return ERR_PTR(pdata->wakeirq); + } + return pdata; } #else @@ -564,11 +569,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 > 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 setup 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
* Re: [PATCH v3 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt 2015-07-23 14:54 ` [PATCH v3 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt Vignesh R @ 2015-07-27 10:49 ` Roger Quadros 2015-07-27 11:19 ` Vignesh R 0 siblings, 1 reply; 7+ messages in thread From: Roger Quadros @ 2015-07-27 10:49 UTC (permalink / raw) To: Vignesh R, Dmitry Torokhov, Tony Lindgren, Benoit Cousson, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King Cc: Henrik Rydberg, Frodo Lai, Jingoo Han, linux-omap, devicetree, linux-arm-kernel, linux-kernel, linux-input Hi, On 23/07/15 17:54, 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> > --- > > v3: > * handle error code returned by of_irq_get_byname() > > v2: > * use of_irq_get_byname() > * remove enable/disable_wake_irq() > > drivers/input/touchscreen/pixcir_i2c_ts.c | 22 ++++++++++++++++++---- > include/linux/input/pixcir_ts.h | 1 + > 2 files changed, 19 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c > index 8f3e243a62bf..3a4ab358bf52 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,13 @@ 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, "wakeup"); > + if (pdata->wakeirq < 0 && pdata->wakeirq != -ENODATA && > + pdata->wakeirq != -EINVAL) { > + dev_err(dev, "Failed to get wakeirq\n"); > + return ERR_PTR(pdata->wakeirq); > + } > + > return pdata; > } > #else > @@ -564,11 +569,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 > 0) ? > + dev_pm_set_dedicated_wake_irq(dev, pdata->wakeirq) : > + dev_pm_set_wake_irq(dev, client->irq); Can 0 be a valid wakeirq or client->irq? If yes then this logic is broken. I would set wakeirq to -EINVAL or something if it is not available during probe and check for that condition. > + if (error) > + dev_info(dev, "unable to setup 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; > }; > > cheers, -roger ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt 2015-07-27 10:49 ` Roger Quadros @ 2015-07-27 11:19 ` Vignesh R 2015-07-27 21:20 ` Dmitry Torokhov 0 siblings, 1 reply; 7+ messages in thread From: Vignesh R @ 2015-07-27 11:19 UTC (permalink / raw) To: Roger Quadros, Dmitry Torokhov, Tony Lindgren, Benoit Cousson, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King Cc: Henrik Rydberg, Frodo Lai, Jingoo Han, linux-omap, devicetree, linux-arm-kernel, linux-kernel, linux-input On 07/27/2015 04:19 PM, Roger Quadros wrote: > Hi, > > On 23/07/15 17:54, 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> >> --- >> >> v3: >> * handle error code returned by of_irq_get_byname() >> >> v2: >> * use of_irq_get_byname() >> * remove enable/disable_wake_irq() >> >> drivers/input/touchscreen/pixcir_i2c_ts.c | 22 ++++++++++++++++++---- >> include/linux/input/pixcir_ts.h | 1 + >> 2 files changed, 19 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c >> index 8f3e243a62bf..3a4ab358bf52 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,13 @@ 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, "wakeup"); >> + if (pdata->wakeirq < 0 && pdata->wakeirq != -ENODATA && >> + pdata->wakeirq != -EINVAL) { >> + dev_err(dev, "Failed to get wakeirq\n"); >> + return ERR_PTR(pdata->wakeirq); >> + } >> + >> return pdata; >> } >> #else >> @@ -564,11 +569,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 > 0) ? >> + dev_pm_set_dedicated_wake_irq(dev, pdata->wakeirq) : >> + dev_pm_set_wake_irq(dev, client->irq); > > Can 0 be a valid wakeirq or client->irq? > If yes then this logic is broken. > AFAIK, IRQ 0 is always assigned to system timer interrupt (cannot find reliable source to quote). > I would set wakeirq to -EINVAL or something if it is not available > during probe and check for that condition. > Not sure, if I understand you correctly pdata->wakeirq will have -ENODATA or -EINVAL(as returned by of_irq_get_byname()), if wakeirq is not available. Do you want me to check for these two conditions specifically rather than (pdata->wakeirq > 0) ? -- Regards Vignesh ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt 2015-07-27 11:19 ` Vignesh R @ 2015-07-27 21:20 ` Dmitry Torokhov 2015-07-28 9:04 ` Roger Quadros 0 siblings, 1 reply; 7+ messages in thread From: Dmitry Torokhov @ 2015-07-27 21:20 UTC (permalink / raw) To: Vignesh R Cc: Roger Quadros, Tony Lindgren, Benoit Cousson, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, Henrik Rydberg, Frodo Lai, Jingoo Han, linux-omap, devicetree, linux-arm-kernel, linux-kernel, linux-input On Mon, Jul 27, 2015 at 04:49:22PM +0530, Vignesh R wrote: > > > On 07/27/2015 04:19 PM, Roger Quadros wrote: > > Hi, > > > > On 23/07/15 17:54, 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> > >> --- > >> > >> v3: > >> * handle error code returned by of_irq_get_byname() > >> > >> v2: > >> * use of_irq_get_byname() > >> * remove enable/disable_wake_irq() > >> > >> drivers/input/touchscreen/pixcir_i2c_ts.c | 22 ++++++++++++++++++---- > >> include/linux/input/pixcir_ts.h | 1 + > >> 2 files changed, 19 insertions(+), 4 deletions(-) > >> > >> diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c > >> index 8f3e243a62bf..3a4ab358bf52 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,13 @@ 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, "wakeup"); > >> + if (pdata->wakeirq < 0 && pdata->wakeirq != -ENODATA && > >> + pdata->wakeirq != -EINVAL) { > >> + dev_err(dev, "Failed to get wakeirq\n"); > >> + return ERR_PTR(pdata->wakeirq); > >> + } > >> + > >> return pdata; > >> } > >> #else > >> @@ -564,11 +569,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 > 0) ? > >> + dev_pm_set_dedicated_wake_irq(dev, pdata->wakeirq) : > >> + dev_pm_set_wake_irq(dev, client->irq); > > > > Can 0 be a valid wakeirq or client->irq? > > If yes then this logic is broken. > > > > AFAIK, IRQ 0 is always assigned to system timer interrupt (cannot find > reliable source to quote). > > > I would set wakeirq to -EINVAL or something if it is not available > > during probe and check for that condition. > > > > Not sure, if I understand you correctly > pdata->wakeirq will have -ENODATA or -EINVAL(as returned by > of_irq_get_byname()), if wakeirq is not available. Do you want me to > check for these two conditions specifically rather than > (pdata->wakeirq > 0) ? 0 is not really valid general IRQ number; I2C for example sets client->irq to 0 when there is no IRQ. BTW, what do you think about my patch pushing this into i2c core? Could you try and see if it works for you? Thanks. -- Dmitry ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt 2015-07-27 21:20 ` Dmitry Torokhov @ 2015-07-28 9:04 ` Roger Quadros 0 siblings, 0 replies; 7+ messages in thread From: Roger Quadros @ 2015-07-28 9:04 UTC (permalink / raw) To: Dmitry Torokhov, Vignesh R Cc: Tony Lindgren, Benoit Cousson, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, Henrik Rydberg, Frodo Lai, Jingoo Han, linux-omap, devicetree, linux-arm-kernel, linux-kernel, linux-input On 28/07/15 00:20, Dmitry Torokhov wrote: > On Mon, Jul 27, 2015 at 04:49:22PM +0530, Vignesh R wrote: >> >> >> On 07/27/2015 04:19 PM, Roger Quadros wrote: >>> Hi, >>> >>> On 23/07/15 17:54, 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> >>>> --- >>>> >>>> v3: >>>> * handle error code returned by of_irq_get_byname() >>>> >>>> v2: >>>> * use of_irq_get_byname() >>>> * remove enable/disable_wake_irq() >>>> >>>> drivers/input/touchscreen/pixcir_i2c_ts.c | 22 ++++++++++++++++++---- >>>> include/linux/input/pixcir_ts.h | 1 + >>>> 2 files changed, 19 insertions(+), 4 deletions(-) >>>> >>>> diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c >>>> index 8f3e243a62bf..3a4ab358bf52 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,13 @@ 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, "wakeup"); >>>> + if (pdata->wakeirq < 0 && pdata->wakeirq != -ENODATA && >>>> + pdata->wakeirq != -EINVAL) { >>>> + dev_err(dev, "Failed to get wakeirq\n"); >>>> + return ERR_PTR(pdata->wakeirq); >>>> + } >>>> + >>>> return pdata; >>>> } >>>> #else >>>> @@ -564,11 +569,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 > 0) ? >>>> + dev_pm_set_dedicated_wake_irq(dev, pdata->wakeirq) : >>>> + dev_pm_set_wake_irq(dev, client->irq); >>> >>> Can 0 be a valid wakeirq or client->irq? >>> If yes then this logic is broken. >>> >> >> AFAIK, IRQ 0 is always assigned to system timer interrupt (cannot find >> reliable source to quote). >> >>> I would set wakeirq to -EINVAL or something if it is not available >>> during probe and check for that condition. >>> >> >> Not sure, if I understand you correctly >> pdata->wakeirq will have -ENODATA or -EINVAL(as returned by >> of_irq_get_byname()), if wakeirq is not available. Do you want me to >> check for these two conditions specifically rather than >> (pdata->wakeirq > 0) ? > > 0 is not really valid general IRQ number; I2C for example sets > client->irq to 0 when there is no IRQ. OK. If we assume 0 is invalid IRQ, then the patch is fine. cheers, -roger ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 2/2] ARM: dts: am437x-gp-evm: Add wakeup interrupt source for pixcir_i2c_tsc 2015-07-23 14:54 [PATCH v3 0/2] pixcir_i2c_ts: Add optional wakeup irq support Vignesh R 2015-07-23 14:54 ` [PATCH v3 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt Vignesh R @ 2015-07-23 14:54 ` Vignesh R 1 sibling, 0 replies; 7+ messages in thread From: Vignesh R @ 2015-07-23 14:54 UTC (permalink / raw) To: Dmitry Torokhov, Tony Lindgren, Benoit Cousson, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King Cc: Roger Quadros, Henrik Rydberg, Frodo Lai, Jingoo Han, linux-omap, devicetree, linux-arm-kernel, linux-kernel, linux-input, Vignesh R 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> --- v3: * Drop "irq" suffix from interrupt-names. 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..99209a137c63 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 = "tsc", "wakeup"; + 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-28 9:04 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-07-23 14:54 [PATCH v3 0/2] pixcir_i2c_ts: Add optional wakeup irq support Vignesh R 2015-07-23 14:54 ` [PATCH v3 1/2] input: touchscreen: pixcir_i2c_ts: Add support for optional wakeup interrupt Vignesh R 2015-07-27 10:49 ` Roger Quadros 2015-07-27 11:19 ` Vignesh R 2015-07-27 21:20 ` Dmitry Torokhov 2015-07-28 9:04 ` Roger Quadros 2015-07-23 14:54 ` [PATCH v3 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).