From: Zubair Lutfullah <zubair.lutfullah@gmail.com>
To: jic23@cam.ac.uk
Cc: gregkh@linuxfoundation.org, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org, koen@dominion.thruhere.net
Subject: [PATCH 08/15] iio: ti_am335x_adc: Handle overrun before threshold event
Date: Thu, 18 Jul 2013 23:21:19 +0100 [thread overview]
Message-ID: <1374186086-5015-9-git-send-email-zubair.lutfullah@gmail.com> (raw)
In-Reply-To: <1374186086-5015-1-git-send-email-zubair.lutfullah@gmail.com>
From: Russ Dill <Russ.Dill@ti.com>
If an overrun occurs, the threshold event is meaningless, handle
the overrun event first.
Signed-off-by: Russ Dill <Russ.Dill@ti.com>
Signed-off-by: Zubair Lutfullah <zubair.lutfullah@gmail.com>
---
drivers/iio/adc/ti_am335x_adc.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 1c47818..7ac28a9 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -167,7 +167,16 @@ static irqreturn_t tiadc_irq(int irq, void *private)
unsigned int status, config;
status = tiadc_readl(adc_dev, REG_IRQSTATUS);
- if (status & IRQENB_FIFO1THRES) {
+ if (status & IRQENB_FIFO1OVRRUN) {
+ config = tiadc_readl(adc_dev, REG_CTRL);
+ config &= ~(CNTRLREG_TSCSSENB);
+ tiadc_writel(adc_dev, REG_CTRL, config);
+ tiadc_writel(adc_dev, REG_IRQSTATUS,
+ IRQENB_FIFO1OVRRUN | IRQENB_FIFO1UNDRFLW);
+ tiadc_writel(adc_dev, REG_CTRL,
+ (config | CNTRLREG_TSCSSENB));
+ return IRQ_HANDLED;
+ } else if (status & IRQENB_FIFO1THRES) {
tiadc_writel(adc_dev, REG_IRQCLR,
IRQENB_FIFO1THRES);
@@ -180,19 +189,6 @@ static irqreturn_t tiadc_irq(int irq, void *private)
tiadc_writel(adc_dev, REG_IRQSTATUS,
IRQENB_FIFO1THRES);
return IRQ_HANDLED;
- } else if ((status & IRQENB_FIFO1OVRRUN) ||
- (status & IRQENB_FIFO1UNDRFLW)) {
- config = tiadc_readl(adc_dev, REG_CTRL);
- config &= ~(CNTRLREG_TSCSSENB);
- tiadc_writel(adc_dev, REG_CTRL, config);
-
- tiadc_writel(adc_dev, REG_IRQSTATUS,
- IRQENB_FIFO1OVRRUN |
- IRQENB_FIFO1UNDRFLW);
-
- tiadc_writel(adc_dev, REG_CTRL,
- (config | CNTRLREG_TSCSSENB));
- return IRQ_HANDLED;
} else {
return IRQ_NONE;
}
--
1.7.9.5
next prev parent reply other threads:[~2013-07-18 22:21 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-18 22:21 [PATCH 00/15] iio: ti_am335x_adc: Add continuous mode take 2 Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 01/15] MFD: ti_tscadc: disable TSC config registers in adc mode Zubair Lutfullah
2013-07-18 22:45 ` Greg KH
2013-07-19 20:47 ` Zubair Lutfullah :
2013-07-19 23:13 ` Greg KH
2013-07-18 22:21 ` [PATCH 02/15] iio: ti_am335x_adc: Fix wrong samples received on 1st read Zubair Lutfullah
2013-07-20 10:52 ` Jonathan Cameron
2013-07-18 22:21 ` [PATCH 03/15] input: ti_tsc: Enable shared IRQ for TSC Zubair Lutfullah
2013-07-20 10:57 ` Jonathan Cameron
2013-07-20 10:58 ` Jonathan Cameron
2013-07-18 22:21 ` [PATCH 04/15] iio: mfd: input: ti_am335x_adc:Add support for continuous mode Zubair Lutfullah
2013-07-20 11:15 ` Jonathan Cameron
2013-07-18 22:21 ` [PATCH 05/15] MFD: ti_tscadc: ADC Clock check not required Zubair Lutfullah
2013-07-20 11:16 ` Jonathan Cameron
2013-07-18 22:21 ` [PATCH 06/15] iio: ti_am335x_adc: Handle set to clear IRQENABLE Zubair Lutfullah
2013-07-20 11:19 ` Jonathan Cameron
2013-07-18 22:21 ` [PATCH 07/15] iio: ti_am335x_adc: Handle set to clear IRQSTATUS Zubair Lutfullah
2013-07-18 22:21 ` Zubair Lutfullah [this message]
2013-07-20 11:21 ` [PATCH 08/15] iio: ti_am335x_adc: Handle overrun before threshold event Jonathan Cameron
2013-07-18 22:21 ` [PATCH 09/15] iio: ti_am335x_adc: Avoid double " Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 10/15] iio: ti_am335x_adc: Also clear threshold event when clearing overrun event Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 11/15] iio: ti_am335x_adc: Print error and handle short FIFO events Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 12/15] iio: ti_am335x_adc: Fix allocation count of FIFO buffer Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 13/15] iio: ti_am335x_adc: Fix capture operation during resume Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 14/15] iio: ti_am335x_adc: Reset and clear overrun status before capture Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 15/15] iio: ti_am335x_adc: Properly handle out of memory situation Zubair Lutfullah
2013-07-20 11:25 ` [PATCH 00/15] iio: ti_am335x_adc: Add continuous mode take 2 Jonathan Cameron
2013-07-20 12:47 ` Zubair Lutfullah :
2013-07-20 12:54 ` Lars-Peter Clausen
2013-07-20 13:50 ` Jonathan Cameron
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=1374186086-5015-9-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).