1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 98a7d12..8fba8a8 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -20,7 +20,7 @@
* Copyright 2009 Simtec Electronics <linux@simtec.co.uk>
*
* Additional work by Herbert Pötzl <herbert@13thfloor.at> and
- * Harald Welte <laforge@openmoko.org>
+ * Harald Welte <laforge@openmoko.org> and Gennady Kupava <gb@bsdmn.com>
*/
#include <linux/errno.h>
@@ -83,10 +83,15 @@ struct s3c2410ts {
int irq_tc;
int count;
int shift;
+ int expectedintr; /* kind of interrupt we are waiting for */
};
static struct s3c2410ts ts;
+#define WAITFORINT_UP (0)
+#define WAITFORINT_DOWN (1)
+#define WAITFORINT_NOTHING (2)
+
/**
* s3c2410_ts_connect - configure gpio for s3c2410 systems
*
@@ -154,7 +159,8 @@ static void touch_timer_fire(unsigned long data)
input_report_key(ts.input, BTN_TOUCH, 0);
input_sync(ts.input);
-
+
+ ts.expectedintr = WAITFORINT_DOWN;
writel(WAIT4INT | INT_DOWN, ts.io + S3C2410_ADCTSC);
}
}
@@ -179,9 +185,18 @@ static irqreturn_t stylus_irq(int irq, void *dev_id)
down = get_down(data0, data1);
- /* TODO we should never get an interrupt with down set while
- * the timer is running, but maybe we ought to verify that the
- * timer isn't running anyways. */
+ /* sitautions below can actually happen on openmoko hardware while
+ various debugging facilities are turned off */
+ if (ts.expectedintr == WAITFORINT_NOTHING)
+ return IRQ_HANDLED;
+ if (!down && ts.expectedintr == WAITFORINT_DOWN) {
+ writel(WAIT4INT | INT_DOWN, ts.io + S3C2410_ADCTSC);
+ return IRQ_HANDLED;
+ } else if (down && ts.expectedintr == WAITFORINT_UP) {
+ writel(WAIT4INT | INT_UP, ts.io + S3C2410_ADCTSC);
+ return IRQ_HANDLED;
+ }
+ ts.expectedintr = WAITFORINT_NOTHING;
if (down)
s3c_adc_start(ts.client, 0, 1 << ts.shift);
@@ -235,6 +250,7 @@ static void s3c24xx_ts_select(struct s3c_adc_client *client, unsigned select)
ts.io + S3C2410_ADCTSC);
} else {
mod_timer(&touch_timer, jiffies+1);
+ ts.expectedintr = WAITFORINT_UP;
writel(WAIT4INT | INT_UP, ts.io + S3C2410_ADCTSC);
}
}
@@ -312,6 +328,7 @@ static int __devinit s3c2410ts_probe(struct platform_device *pdev)
if ((info->delay & 0xffff) > 0)
writel(info->delay & 0xffff, ts.io + S3C2410_ADCDLY);
+ ts.expectedintr = WAITFORINT_DOWN;
writel(WAIT4INT | INT_DOWN, ts.io + S3C2410_ADCTSC);
input_dev = input_allocate_device();
@@ -389,6 +406,7 @@ static int __devexit s3c2410ts_remove(struct platform_device *pdev)
#ifdef CONFIG_PM
static int s3c2410ts_suspend(struct device *dev)
{
+ ts.expectedintr = WAITFORINT_NOTHING;
writel(TSC_SLEEP, ts.io + S3C2410_ADCTSC);
disable_irq(ts.irq_tc);
clk_disable(ts.clock);
@@ -408,6 +426,7 @@ static int s3c2410ts_resume(struct device *dev)
if ((info->delay & 0xffff) > 0)
writel(info->delay & 0xffff, ts.io + S3C2410_ADCDLY);
+ ts.expectedintr = WAITFORINT_DOWN;
writel(WAIT4INT | INT_DOWN, ts.io + S3C2410_ADCTSC);
return 0;
|
