The patch titled
input: tsc2007: make platform callbacks optional
has been removed from the -mm tree. Its filename was
input-tsc2007-make-platform-callbacks-optional.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: input: tsc2007: make platform callbacks optional
From: Richard Röjfors <richard.rojfors.ext@xxxxxxxxxxxxxxx>
The platform callbacks are only called if supplied. Makes the driver to
fallback on only pressure calculation to decide when the pen is up.
Signed-off-by: Richard Röjfors <richard.rojfors.ext@xxxxxxxxxxxxxxx>
Cc: Thierry Reding <thierry.reding@xxxxxxxxxxxxxxxxx>
Cc: Trilok Soni <soni.trilok@xxxxxxxxx>
Cc: <kwangwoo.lee@xxxxxxxxx>
Cc: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/input/touchscreen/tsc2007.c | 34 +++++++++++++++++++-------
1 file changed, 26 insertions(+), 8 deletions(-)
diff -puN drivers/input/touchscreen/tsc2007.c~input-tsc2007-make-platform-callbacks-optional drivers/input/touchscreen/tsc2007.c
--- a/drivers/input/touchscreen/tsc2007.c~input-tsc2007-make-platform-callbacks-optional
+++ a/drivers/input/touchscreen/tsc2007.c
@@ -59,6 +59,10 @@
#define READ_X (ADC_ON_12BIT | TSC2007_MEASURE_X)
#define PWRDOWN (TSC2007_12BIT | TSC2007_POWER_OFF_IRQ_EN)
+#define PEN_STATE_UP 0x00
+#define PEN_STATE_DOWN 0x01
+#define PEN_STATE_IRQ 0x01
+
struct ts_event {
u16 x;
u16 y;
@@ -76,7 +80,7 @@ struct tsc2007 {
u16 model;
u16 x_plate_ohms;
- unsigned pendown;
+ unsigned penstate;
int irq;
int (*get_pendown_state)(void);
@@ -149,15 +153,18 @@ static void tsc2007_send_event(void *tsc
*
* The only safe way to check for the pen up condition is in the
* work function by reading the pen signal state (it's a GPIO and IRQ).
+ *
+ * But sadly we don't always have the possibility to use such callback
+ * in that case rely on the pressure anyway
*/
if (rt) {
struct input_dev *input = ts->input;
- if (!ts->pendown) {
+ if (ts->penstate != PEN_STATE_DOWN) {
dev_dbg(&ts->client->dev, "DOWN\n");
input_report_key(input, BTN_TOUCH, 1);
- ts->pendown = 1;
+ ts->penstate = PEN_STATE_DOWN;
}
input_report_abs(input, ABS_X, x);
@@ -168,7 +175,9 @@ static void tsc2007_send_event(void *tsc
dev_dbg(&ts->client->dev, "point(%4d,%4d), pressure (%4u)\n",
x, y, rt);
- }
+ } else if (!ts->get_pendown_state)
+ /* no callback to check pendown state, use pressure */
+ ts->penstate = PEN_STATE_UP;
schedule_delayed_work(&ts->work, TS_POLL_PERIOD);
}
@@ -195,7 +204,14 @@ static void tsc2007_work(struct work_str
{
struct tsc2007 *ts =
container_of(to_delayed_work(work), struct tsc2007, work);
- if (unlikely(!ts->get_pendown_state() && ts->pendown)) {
+
+ /* either we have the pendown callback, and use it, otherwise
+ * we look at the pendown variable
+ */
+ if ((ts->get_pendown_state && unlikely(!ts->get_pendown_state()) &&
+ ts->penstate != PEN_STATE_UP) ||
+ (!ts->get_pendown_state &&
+ unlikely(ts->penstate == PEN_STATE_UP))) {
struct input_dev *input = ts->input;
dev_dbg(&ts->client->dev, "UP\n");
@@ -204,7 +220,7 @@ static void tsc2007_work(struct work_str
input_report_abs(input, ABS_PRESSURE, 0);
input_sync(input);
- ts->pendown = 0;
+ ts->penstate = PEN_STATE_UP;
enable_irq(ts->irq);
} else {
/* pen is still down, continue with the measurement */
@@ -219,8 +235,9 @@ static irqreturn_t tsc2007_irq(int irq,
{
struct tsc2007 *ts = handle;
- if (likely(ts->get_pendown_state())) {
+ if (!ts->get_pendown_state || likely(ts->get_pendown_state())) {
disable_irq_nosync(ts->irq);
+ ts->penstate = PEN_STATE_IRQ;
schedule_delayed_work(&ts->work, 0);
}
@@ -264,7 +281,8 @@ static int tsc2007_probe(struct i2c_clie
ts->get_pendown_state = pdata->get_pendown_state;
ts->clear_penirq = pdata->clear_penirq;
- pdata->init_platform_hw();
+ if (pdata->init_platform_hw)
+ pdata->init_platform_hw();
snprintf(ts->phys, sizeof(ts->phys),
"%s/input0", dev_name(&client->dev));
_
Patches currently in -mm which might be from richard.rojfors.ext@xxxxxxxxxxxxxxx are
linux-next.patch
video-initial-support-for-adv7180.patch
gpio-add-mc33880-driver.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
