summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorJohn Sung <penmount.touch@gmail.com>2011-09-09 13:33:12 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-09-20 22:46:30 -0700
commitbd8f6d2ed416d6c70fc3d4f98b165a56e025331c (patch)
tree3ee326d0fab541b53f1e89dba891dbc160929c9d /drivers/input
parent90aba7d8b155c2c39e269608e4a446190e3cd704 (diff)
Input: penmount - add PenMount 6250 support
Add multi touch support for PenMount 6250 touch controller. Signed-off-by: John Sung <penmount.touch@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/penmount.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/penmount.c b/drivers/input/touchscreen/penmount.c
index 71422b91dc46..a047850e38b1 100644
--- a/drivers/input/touchscreen/penmount.c
+++ b/drivers/input/touchscreen/penmount.c
@@ -37,6 +37,7 @@ MODULE_LICENSE("GPL");
#define PM_MAX_LENGTH 6
#define PM_MAX_MTSLOT 16
#define PM_3000_MTSLOT 2
+#define PM_6250_MTSLOT 12
/*
* Multi-touch slot
@@ -150,6 +151,21 @@ static irqreturn_t pm_interrupt(struct serio *serio,
}
}
break;
+
+ case 0x6250:
+ if ((pm->data[0] & 0xb0) == 0x30) {
+ if (pm->packetsize == ++pm->idx) {
+ if (pm_checkpacket(pm->data)) {
+ int slotnum = pm->data[0] & 0x0f;
+ pm->slots[slotnum].active = pm->data[0] & 0x40;
+ pm->slots[slotnum].x = pm->data[2] * 256 + pm->data[1];
+ pm->slots[slotnum].y = pm->data[4] * 256 + pm->data[3];
+ pm_mtevent(pm, dev);
+ }
+ pm->idx = 0;
+ }
+ }
+ break;
}
return IRQ_HANDLED;
@@ -227,6 +243,13 @@ static int pm_connect(struct serio *serio, struct serio_driver *drv)
max_x = max_y = 0x7ff;
pm->maxcontacts = PM_3000_MTSLOT;
break;
+
+ case 3:
+ pm->packetsize = 6;
+ input_dev->id.product = 0x6250;
+ max_x = max_y = 0x3ff;
+ pm->maxcontacts = PM_6250_MTSLOT;
+ break;
}
input_set_abs_params(pm->dev, ABS_X, 0, max_x, 0, 0);