From: Zubair Lutfullah <zubair.lutfullah@gmail.com>
To: jic23@cam.ac.uk
Cc: linux-iio@vger.kernel.org, gregkh@linuxfoundation.org,
linux-kernel@vger.kernel.org, koen@dominion.thruhere.net,
zubair.lutfullah@gmail.com
Subject: [PATCH 04/21] input: ti_tsc: Enable shared IRQ for TSC
Date: Wed, 17 Jul 2013 18:26:33 +0100 [thread overview]
Message-ID: <1374082010-28095-5-git-send-email-zubair.lutfullah@gmail.com> (raw)
In-Reply-To: <1374082010-28095-1-git-send-email-zubair.lutfullah@gmail.com>
Touchscreen and ADC share the same IRQ line from parent
MFD core.
Previously only Touchscreen was interrupt based.
With continuous mode support added in ADC driver, now driver requires
interrupt to process the ADC samples, so enable shared IRQ flag bit for
touchscreen.
This patch is based on work in the 3.2 tree by TI
Original Author is Patil Rachna
Signed-off-by: Zubair Lutfullah <zubair.lutfullah@gmail.com>
---
drivers/input/touchscreen/ti_am335x_tsc.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index 0e9f02a..cf56cae 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -260,8 +260,16 @@ static irqreturn_t titsc_irq(int irq, void *dev)
unsigned int fsm;
status = titsc_readl(ts_dev, REG_IRQSTATUS);
- if (status & IRQENB_FIFO0THRES) {
-
+
+ /*
+ * ADC and touchscreen share the IRQ line.
+ * FIFO1 threshold interrupt is used by ADC,
+ * hence return from touchscreen IRQ handler if FIFO1
+ * threshold interrupt occurred.
+ */
+ if (status & IRQENB_FIFO1THRES)
+ return IRQ_NONE;
+ else if (status & IRQENB_FIFO0THRES) {
titsc_read_coordinates(ts_dev, &x, &y, &z1, &z2);
if (ts_dev->pen_down && z1 != 0 && z2 != 0) {
@@ -315,7 +323,7 @@ static irqreturn_t titsc_irq(int irq, void *dev)
}
if (irqclr) {
- titsc_writel(ts_dev, REG_IRQSTATUS, irqclr);
+ titsc_writel(ts_dev, REG_IRQSTATUS, (status | irqclr) );
am335x_tsc_se_update(ts_dev->mfd_tscadc);
return IRQ_HANDLED;
}
@@ -389,7 +397,7 @@ static int titsc_probe(struct platform_device *pdev)
}
err = request_irq(ts_dev->irq, titsc_irq,
- 0, pdev->dev.driver->name, ts_dev);
+ IRQF_SHARED, pdev->dev.driver->name, ts_dev);
if (err) {
dev_err(&pdev->dev, "failed to allocate irq.\n");
goto err_free_mem;
--
1.7.9.5
next prev parent reply other threads:[~2013-07-17 17:27 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-17 17:26 [PATCH 00/21] iio: TI-am335x-adc continuous mode Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 01/21] MFD: ti_tscadc: disable TSC control Zubair Lutfullah
2013-07-17 17:34 ` Greg KH
2013-07-17 17:26 ` [PATCH 02/21] IIO: ADC: ti_adc: Fix 1st sample read Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 03/21] iio: ti_am335x_adc: Added iio_voltageX_scale Zubair Lutfullah
2013-07-17 17:36 ` Greg KH
2013-07-17 17:26 ` Zubair Lutfullah [this message]
2013-07-17 17:26 ` [PATCH 05/21] iio: input: am335x_adc: Add continuous mode to adc Zubair Lutfullah
2013-07-17 17:38 ` Greg KH
[not found] ` <CAExKytyQ23VXMVyRX9OHEQ8HZT5tFhKHSjhaH_-G_O1BVL91-A@mail.gmail.com>
2013-07-17 18:09 ` Greg KH
2013-07-18 8:08 ` Felipe Balbi
2013-07-17 17:26 ` [PATCH 06/21] MFD: ti_tscadc: ADC Clock check not required Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 07/21] iio: TI-am335x-adc: Cleanup Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 08/21] IIO: ti_adc: Handle set to clear IRQENABLE register properly Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 09/21] IIO: ti_adc: Handle set to clear IRQSTATUS " Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 10/21] IIO: ti_adc: Handle overrun before threshold event Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 11/21] iio: ti_adc: Avoid double " Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 12/21] IIO: ti_adc: Also clear threshold event when clearing overrun event Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 13/21] IO: ti_adc: Reset and clear overrun status before capture Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 14/21] IIO: ti_adc: Properly handle out of memory situation Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 15/21] IIO: ti_adc: Print error and handle short FIFO events Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 16/21] IIO: ti_adc: Fix allocation count of FIFO buffer Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 17/21] Revert "IIO: ti_adc: Correct wrong samples received on 1st read in continuous mode" Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 18/21] IIO: ti_adc: Fix capture operation during resume Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 19/21] iio: ti_amss5x adc Fix check_patch.pl issues Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 20/21] input: ti_am335x_tsc.c fix checkpatch.pl issues Zubair Lutfullah
2013-07-17 17:26 ` [PATCH 21/21] mfd: ti_am335x_tscadc.c " Zubair Lutfullah
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=1374082010-28095-5-git-send-email-zubair.lutfullah@gmail.com \
--to=zubair.lutfullah@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@cam.ac.uk \
--cc=koen@dominion.thruhere.net \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).