aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorPatil, Rachna <rachna@ti.com>2013-01-23 22:45:07 -0500
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2013-06-12 12:36:29 -0400
commitaf9c2fe3740fe8dac05eede8805d9aaa45972cb6 (patch)
tree67a3adfdf5c5323092899f40cc806257040f2166 /drivers/input
parentbb76dc09ddfc135c6c5e8eb7d3c583bfa8bdd439 (diff)
input: ti_am33x_tsc: remove unwanted fifo flush
When touchscreen and ADC are used together, this unwanted fifo flush leads to loss of ADC data. Signed-off-by: Patil, Rachna <rachna@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/ti_am335x_tsc.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index 2bdd66cd76a7..7b7de6035af7 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -252,8 +252,6 @@ static irqreturn_t titsc_irq(int irq, void *dev)
252 unsigned int x = 0, y = 0; 252 unsigned int x = 0, y = 0;
253 unsigned int z1, z2, z; 253 unsigned int z1, z2, z;
254 unsigned int fsm; 254 unsigned int fsm;
255 unsigned int fifo1count, fifo0count;
256 int i;
257 255
258 status = titsc_readl(ts_dev, REG_IRQSTATUS); 256 status = titsc_readl(ts_dev, REG_IRQSTATUS);
259 if (status & IRQENB_FIFO0THRES) { 257 if (status & IRQENB_FIFO0THRES) {
@@ -262,14 +260,6 @@ static irqreturn_t titsc_irq(int irq, void *dev)
262 z1 = titsc_readl(ts_dev, REG_FIFO0) & 0xfff; 260 z1 = titsc_readl(ts_dev, REG_FIFO0) & 0xfff;
263 z2 = titsc_readl(ts_dev, REG_FIFO1) & 0xfff; 261 z2 = titsc_readl(ts_dev, REG_FIFO1) & 0xfff;
264 262
265 fifo1count = titsc_readl(ts_dev, REG_FIFO1CNT);
266 for (i = 0; i < fifo1count; i++)
267 titsc_readl(ts_dev, REG_FIFO1);
268
269 fifo0count = titsc_readl(ts_dev, REG_FIFO0CNT);
270 for (i = 0; i < fifo0count; i++)
271 titsc_readl(ts_dev, REG_FIFO0);
272
273 if (ts_dev->pen_down && z1 != 0 && z2 != 0) { 263 if (ts_dev->pen_down && z1 != 0 && z2 != 0) {
274 /* 264 /*
275 * Calculate pressure using formula 265 * Calculate pressure using formula