* [PATCH v2] mfd/stmpe: Add support for no-interrupt config
@ 2012-01-24 22:59 Linus Walleij
2012-01-25 3:37 ` Viresh Kumar
0 siblings, 1 reply; 2+ messages in thread
From: Linus Walleij @ 2012-01-24 22:59 UTC (permalink / raw)
To: Samuel Ortiz, linux-kernel; +Cc: Viresh Kumar, Chris Blair, Linus Walleij
From: Chris Blair <chris.blair@stericsson.com>
Adds support for boards which have an STMPE device without the
interrupt pin connected.
Cc: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Chris Blair <chris.blair@stericsson.com>
Tested-by: Michel Jaouen <michel.jaouen@stericsson.com>
Reviewed-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v1->v2:
- Corrects initialisation, error condition and driver removal cleanup
for the no-irq configuration.
---
drivers/mfd/stmpe.c | 114 +++++++++++++++++++++++++-------------------
include/linux/mfd/stmpe.h | 2 +
2 files changed, 67 insertions(+), 49 deletions(-)
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index e07947e..04bb013 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -864,7 +864,7 @@ static int __devinit stmpe_chip_init(struct stmpe *stmpe)
unsigned int irq_trigger = stmpe->pdata->irq_trigger;
int autosleep_timeout = stmpe->pdata->autosleep_timeout;
struct stmpe_variant_info *variant = stmpe->variant;
- u8 icr;
+ u8 icr = 0;
unsigned int id;
u8 data[2];
int ret;
@@ -887,31 +887,33 @@ static int __devinit stmpe_chip_init(struct stmpe *stmpe)
if (ret)
return ret;
- if (id == STMPE801_ID)
- icr = STMPE801_REG_SYS_CTRL_INT_EN;
- else
- icr = STMPE_ICR_LSB_GIM;
-
- /* STMPE801 doesn't support Edge interrupts */
- if (id != STMPE801_ID) {
- if (irq_trigger == IRQF_TRIGGER_FALLING ||
- irq_trigger == IRQF_TRIGGER_RISING)
- icr |= STMPE_ICR_LSB_EDGE;
- }
-
- if (irq_trigger == IRQF_TRIGGER_RISING ||
- irq_trigger == IRQF_TRIGGER_HIGH) {
+ if (!stmpe->pdata->no_irq) {
if (id == STMPE801_ID)
- icr |= STMPE801_REG_SYS_CTRL_INT_HI;
+ icr = STMPE801_REG_SYS_CTRL_INT_EN;
else
- icr |= STMPE_ICR_LSB_HIGH;
- }
+ icr = STMPE_ICR_LSB_GIM;
- if (stmpe->pdata->irq_invert_polarity) {
- if (id == STMPE801_ID)
- icr ^= STMPE801_REG_SYS_CTRL_INT_HI;
- else
- icr ^= STMPE_ICR_LSB_HIGH;
+ /* STMPE801 doesn't support Edge interrupts */
+ if (id != STMPE801_ID) {
+ if (irq_trigger == IRQF_TRIGGER_FALLING ||
+ irq_trigger == IRQF_TRIGGER_RISING)
+ icr |= STMPE_ICR_LSB_EDGE;
+ }
+
+ if (irq_trigger == IRQF_TRIGGER_RISING ||
+ irq_trigger == IRQF_TRIGGER_HIGH) {
+ if (id == STMPE801_ID)
+ icr |= STMPE801_REG_SYS_CTRL_INT_HI;
+ else
+ icr |= STMPE_ICR_LSB_HIGH;
+ }
+
+ if (stmpe->pdata->irq_invert_polarity) {
+ if (id == STMPE801_ID)
+ icr ^= STMPE801_REG_SYS_CTRL_INT_HI;
+ else
+ icr ^= STMPE_ICR_LSB_HIGH;
+ }
}
if (stmpe->pdata->autosleep) {
@@ -988,32 +990,42 @@ int __devinit stmpe_probe(struct stmpe_client_info *ci, int partnum)
if (ci->init)
ci->init(stmpe);
- if (pdata->irq_over_gpio) {
- ret = gpio_request_one(pdata->irq_gpio, GPIOF_DIR_IN, "stmpe");
- if (ret) {
- dev_err(stmpe->dev, "failed to request IRQ GPIO: %d\n",
+ if (pdata->no_irq) {
+ dev_info(stmpe->dev,
+ "board config says IRQs are not supported\n");
+ } else {
+ if (pdata->irq_over_gpio) {
+ ret = gpio_request_one(pdata->irq_gpio, GPIOF_DIR_IN,
+ "stmpe");
+ if (ret) {
+ dev_err(stmpe->dev,
+ "failed to request IRQ GPIO: %d\n",
ret);
- goto out_free;
- }
+ goto out_free;
+ }
- stmpe->irq = gpio_to_irq(pdata->irq_gpio);
- } else {
- stmpe->irq = ci->irq;
+ stmpe->irq = gpio_to_irq(pdata->irq_gpio);
+ } else {
+ stmpe->irq = ci->irq;
+ }
}
ret = stmpe_chip_init(stmpe);
if (ret)
goto free_gpio;
- ret = stmpe_irq_init(stmpe);
- if (ret)
- goto free_gpio;
+ if (!pdata->no_irq) {
+ ret = stmpe_irq_init(stmpe);
+ if (ret)
+ goto free_gpio;
- ret = request_threaded_irq(stmpe->irq, NULL, stmpe_irq,
- pdata->irq_trigger | IRQF_ONESHOT, "stmpe", stmpe);
- if (ret) {
- dev_err(stmpe->dev, "failed to request IRQ: %d\n", ret);
- goto out_removeirq;
+ ret = request_threaded_irq(stmpe->irq, NULL, stmpe_irq,
+ pdata->irq_trigger | IRQF_ONESHOT,
+ "stmpe", stmpe);
+ if (ret) {
+ dev_err(stmpe->dev, "failed to request IRQ: %d\n", ret);
+ goto out_removeirq;
+ }
}
ret = stmpe_devices_init(stmpe);
@@ -1026,11 +1038,13 @@ int __devinit stmpe_probe(struct stmpe_client_info *ci, int partnum)
out_removedevs:
mfd_remove_devices(stmpe->dev);
- free_irq(stmpe->irq, stmpe);
+ if (!pdata->no_irq)
+ free_irq(stmpe->irq, stmpe);
out_removeirq:
- stmpe_irq_remove(stmpe);
+ if (!pdata->no_irq)
+ stmpe_irq_remove(stmpe);
free_gpio:
- if (pdata->irq_over_gpio)
+ if (!pdata->no_irq && pdata->irq_over_gpio)
gpio_free(pdata->irq_gpio);
out_free:
kfree(stmpe);
@@ -1041,11 +1055,13 @@ int stmpe_remove(struct stmpe *stmpe)
{
mfd_remove_devices(stmpe->dev);
- free_irq(stmpe->irq, stmpe);
- stmpe_irq_remove(stmpe);
+ if (!stmpe->pdata->no_irq) {
+ free_irq(stmpe->irq, stmpe);
+ stmpe_irq_remove(stmpe);
- if (stmpe->pdata->irq_over_gpio)
- gpio_free(stmpe->pdata->irq_gpio);
+ if (stmpe->pdata->irq_over_gpio)
+ gpio_free(stmpe->pdata->irq_gpio);
+ }
kfree(stmpe);
@@ -1057,7 +1073,7 @@ static int stmpe_suspend(struct device *dev)
{
struct stmpe *stmpe = dev_get_drvdata(dev);
- if (device_may_wakeup(dev))
+ if (!stmpe->pdata->no_irq && device_may_wakeup(dev))
enable_irq_wake(stmpe->irq);
return 0;
@@ -1067,7 +1083,7 @@ static int stmpe_resume(struct device *dev)
{
struct stmpe *stmpe = dev_get_drvdata(dev);
- if (device_may_wakeup(dev))
+ if (!stmpe->pdata->no_irq && device_may_wakeup(dev))
disable_irq_wake(stmpe->irq);
return 0;
diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h
index ca1d7a3..c4b45fd 100644
--- a/include/linux/mfd/stmpe.h
+++ b/include/linux/mfd/stmpe.h
@@ -188,6 +188,7 @@ struct stmpe_ts_platform_data {
* @irq_invert_polarity: IRQ line is connected with reversed polarity
* @autosleep: bool to enable/disable stmpe autosleep
* @autosleep_timeout: inactivity timeout in milliseconds for autosleep
+ * @no_irq: IRQs are not supported on this board
* @irq_base: base IRQ number. %STMPE_NR_IRQS irqs will be used, or
* %STMPE_NR_INTERNAL_IRQS if the GPIO driver is not used.
* @irq_over_gpio: true if gpio is used to get irq
@@ -200,6 +201,7 @@ struct stmpe_ts_platform_data {
struct stmpe_platform_data {
int id;
unsigned int blocks;
+ bool no_irq;
int irq_base;
unsigned int irq_trigger;
bool irq_invert_polarity;
--
1.7.8
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] mfd/stmpe: Add support for no-interrupt config
2012-01-24 22:59 [PATCH v2] mfd/stmpe: Add support for no-interrupt config Linus Walleij
@ 2012-01-25 3:37 ` Viresh Kumar
0 siblings, 0 replies; 2+ messages in thread
From: Viresh Kumar @ 2012-01-25 3:37 UTC (permalink / raw)
To: Linus WALLEIJ
Cc: Samuel Ortiz, linux-kernel, Christopher BLAIR, Linus Walleij
On 1/25/2012 4:29 AM, Linus WALLEIJ wrote:
> From: Chris Blair <chris.blair@stericsson.com>
>
> Adds support for boards which have an STMPE device without the
> interrupt pin connected.
>
> Cc: Viresh Kumar <viresh.kumar@st.com>
> Signed-off-by: Chris Blair <chris.blair@stericsson.com>
> Tested-by: Michel Jaouen <michel.jaouen@stericsson.com>
> Reviewed-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ChangeLog v1->v2:
> - Corrects initialisation, error condition and driver removal cleanup
> for the no-irq configuration.
> ---
> drivers/mfd/stmpe.c | 114 +++++++++++++++++++++++++-------------------
> include/linux/mfd/stmpe.h | 2 +
> 2 files changed, 67 insertions(+), 49 deletions(-)
>
> diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
> index e07947e..04bb013 100644
> --- a/drivers/mfd/stmpe.c
> +++ b/drivers/mfd/stmpe.c
> @@ -864,7 +864,7 @@ static int __devinit stmpe_chip_init(struct stmpe *stmpe)
> unsigned int irq_trigger = stmpe->pdata->irq_trigger;
> int autosleep_timeout = stmpe->pdata->autosleep_timeout;
> struct stmpe_variant_info *variant = stmpe->variant;
> - u8 icr;
> + u8 icr = 0;
> unsigned int id;
> u8 data[2];
> int ret;
> @@ -887,31 +887,33 @@ static int __devinit stmpe_chip_init(struct stmpe *stmpe)
> if (ret)
> return ret;
>
> - if (id == STMPE801_ID)
> - icr = STMPE801_REG_SYS_CTRL_INT_EN;
> - else
> - icr = STMPE_ICR_LSB_GIM;
> -
> - /* STMPE801 doesn't support Edge interrupts */
> - if (id != STMPE801_ID) {
> - if (irq_trigger == IRQF_TRIGGER_FALLING ||
> - irq_trigger == IRQF_TRIGGER_RISING)
> - icr |= STMPE_ICR_LSB_EDGE;
> - }
> -
> - if (irq_trigger == IRQF_TRIGGER_RISING ||
> - irq_trigger == IRQF_TRIGGER_HIGH) {
> + if (!stmpe->pdata->no_irq) {
> if (id == STMPE801_ID)
> - icr |= STMPE801_REG_SYS_CTRL_INT_HI;
> + icr = STMPE801_REG_SYS_CTRL_INT_EN;
> else
> - icr |= STMPE_ICR_LSB_HIGH;
> - }
> + icr = STMPE_ICR_LSB_GIM;
>
> - if (stmpe->pdata->irq_invert_polarity) {
> - if (id == STMPE801_ID)
> - icr ^= STMPE801_REG_SYS_CTRL_INT_HI;
> - else
> - icr ^= STMPE_ICR_LSB_HIGH;
> + /* STMPE801 doesn't support Edge interrupts */
> + if (id != STMPE801_ID) {
> + if (irq_trigger == IRQF_TRIGGER_FALLING ||
> + irq_trigger == IRQF_TRIGGER_RISING)
> + icr |= STMPE_ICR_LSB_EDGE;
> + }
> +
> + if (irq_trigger == IRQF_TRIGGER_RISING ||
> + irq_trigger == IRQF_TRIGGER_HIGH) {
> + if (id == STMPE801_ID)
> + icr |= STMPE801_REG_SYS_CTRL_INT_HI;
> + else
> + icr |= STMPE_ICR_LSB_HIGH;
> + }
> +
> + if (stmpe->pdata->irq_invert_polarity) {
> + if (id == STMPE801_ID)
> + icr ^= STMPE801_REG_SYS_CTRL_INT_HI;
> + else
> + icr ^= STMPE_ICR_LSB_HIGH;
> + }
> }
>
> if (stmpe->pdata->autosleep) {
> @@ -988,32 +990,42 @@ int __devinit stmpe_probe(struct stmpe_client_info *ci, int partnum)
> if (ci->init)
> ci->init(stmpe);
>
> - if (pdata->irq_over_gpio) {
> - ret = gpio_request_one(pdata->irq_gpio, GPIOF_DIR_IN, "stmpe");
> - if (ret) {
> - dev_err(stmpe->dev, "failed to request IRQ GPIO: %d\n",
> + if (pdata->no_irq) {
> + dev_info(stmpe->dev,
> + "board config says IRQs are not supported\n");
> + } else {
> + if (pdata->irq_over_gpio) {
> + ret = gpio_request_one(pdata->irq_gpio, GPIOF_DIR_IN,
> + "stmpe");
> + if (ret) {
> + dev_err(stmpe->dev,
> + "failed to request IRQ GPIO: %d\n",
> ret);
> - goto out_free;
> - }
> + goto out_free;
> + }
>
> - stmpe->irq = gpio_to_irq(pdata->irq_gpio);
> - } else {
> - stmpe->irq = ci->irq;
> + stmpe->irq = gpio_to_irq(pdata->irq_gpio);
> + } else {
> + stmpe->irq = ci->irq;
> + }
> }
>
> ret = stmpe_chip_init(stmpe);
> if (ret)
> goto free_gpio;
>
> - ret = stmpe_irq_init(stmpe);
> - if (ret)
> - goto free_gpio;
> + if (!pdata->no_irq) {
> + ret = stmpe_irq_init(stmpe);
> + if (ret)
> + goto free_gpio;
>
> - ret = request_threaded_irq(stmpe->irq, NULL, stmpe_irq,
> - pdata->irq_trigger | IRQF_ONESHOT, "stmpe", stmpe);
> - if (ret) {
> - dev_err(stmpe->dev, "failed to request IRQ: %d\n", ret);
> - goto out_removeirq;
> + ret = request_threaded_irq(stmpe->irq, NULL, stmpe_irq,
> + pdata->irq_trigger | IRQF_ONESHOT,
> + "stmpe", stmpe);
> + if (ret) {
> + dev_err(stmpe->dev, "failed to request IRQ: %d\n", ret);
> + goto out_removeirq;
> + }
> }
>
> ret = stmpe_devices_init(stmpe);
> @@ -1026,11 +1038,13 @@ int __devinit stmpe_probe(struct stmpe_client_info *ci, int partnum)
>
> out_removedevs:
> mfd_remove_devices(stmpe->dev);
> - free_irq(stmpe->irq, stmpe);
> + if (!pdata->no_irq)
> + free_irq(stmpe->irq, stmpe);
> out_removeirq:
> - stmpe_irq_remove(stmpe);
> + if (!pdata->no_irq)
> + stmpe_irq_remove(stmpe);
> free_gpio:
> - if (pdata->irq_over_gpio)
> + if (!pdata->no_irq && pdata->irq_over_gpio)
> gpio_free(pdata->irq_gpio);
> out_free:
> kfree(stmpe);
> @@ -1041,11 +1055,13 @@ int stmpe_remove(struct stmpe *stmpe)
> {
> mfd_remove_devices(stmpe->dev);
>
> - free_irq(stmpe->irq, stmpe);
> - stmpe_irq_remove(stmpe);
> + if (!stmpe->pdata->no_irq) {
> + free_irq(stmpe->irq, stmpe);
> + stmpe_irq_remove(stmpe);
>
> - if (stmpe->pdata->irq_over_gpio)
> - gpio_free(stmpe->pdata->irq_gpio);
> + if (stmpe->pdata->irq_over_gpio)
> + gpio_free(stmpe->pdata->irq_gpio);
> + }
>
> kfree(stmpe);
>
> @@ -1057,7 +1073,7 @@ static int stmpe_suspend(struct device *dev)
> {
> struct stmpe *stmpe = dev_get_drvdata(dev);
>
> - if (device_may_wakeup(dev))
> + if (!stmpe->pdata->no_irq && device_may_wakeup(dev))
> enable_irq_wake(stmpe->irq);
>
> return 0;
> @@ -1067,7 +1083,7 @@ static int stmpe_resume(struct device *dev)
> {
> struct stmpe *stmpe = dev_get_drvdata(dev);
>
> - if (device_may_wakeup(dev))
> + if (!stmpe->pdata->no_irq && device_may_wakeup(dev))
> disable_irq_wake(stmpe->irq);
>
> return 0;
> diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h
> index ca1d7a3..c4b45fd 100644
> --- a/include/linux/mfd/stmpe.h
> +++ b/include/linux/mfd/stmpe.h
> @@ -188,6 +188,7 @@ struct stmpe_ts_platform_data {
> * @irq_invert_polarity: IRQ line is connected with reversed polarity
> * @autosleep: bool to enable/disable stmpe autosleep
> * @autosleep_timeout: inactivity timeout in milliseconds for autosleep
> + * @no_irq: IRQs are not supported on this board
> * @irq_base: base IRQ number. %STMPE_NR_IRQS irqs will be used, or
> * %STMPE_NR_INTERNAL_IRQS if the GPIO driver is not used.
> * @irq_over_gpio: true if gpio is used to get irq
> @@ -200,6 +201,7 @@ struct stmpe_ts_platform_data {
> struct stmpe_platform_data {
> int id;
> unsigned int blocks;
> + bool no_irq;
> int irq_base;
> unsigned int irq_trigger;
> bool irq_invert_polarity;
Acked-by: Viresh Kumar <viresh.kumar@st.com>
--
viresh
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-25 3:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-24 22:59 [PATCH v2] mfd/stmpe: Add support for no-interrupt config Linus Walleij
2012-01-25 3:37 ` Viresh Kumar
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).