summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorJoonyoung Shim <jy0922.shim@samsung.com>2011-03-14 21:41:40 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-03-14 21:42:46 -0700
commit4c75de32eb9fcaa14925e2e444748f8b71e4f6fc (patch)
tree3031d5f9315f5dcad79f275af30e7902f5f4fd9d /drivers/input
parent979a72dad9c6649486e35a84324af8e81936af03 (diff)
downloadlinux-3.10-4c75de32eb9fcaa14925e2e444748f8b71e4f6fc.tar.gz
linux-3.10-4c75de32eb9fcaa14925e2e444748f8b71e4f6fc.tar.bz2
linux-3.10-4c75de32eb9fcaa14925e2e444748f8b71e4f6fc.zip
Input: atmel_mxt_ts - add objects of mXT1386 chip
Atmel mXT1386 chip is operated by atmel_mxt_ts driver and it has some different objects. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 0986fa46e9d..4012436633b 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -60,11 +60,15 @@
#define MXT_PROCG_NOISE 22
#define MXT_PROCI_ONETOUCH 24
#define MXT_PROCI_TWOTOUCH 27
+#define MXT_PROCI_GRIP 40
+#define MXT_PROCI_PALM 41
#define MXT_SPT_COMMSCONFIG 18
#define MXT_SPT_GPIOPWM 19
#define MXT_SPT_SELFTEST 25
#define MXT_SPT_CTECONFIG 28
#define MXT_SPT_USERDATA 38
+#define MXT_SPT_DIGITIZER 43
+#define MXT_SPT_MESSAGECOUNT 44
/* MXT_GEN_COMMAND field */
#define MXT_COMMAND_RESET 0
@@ -258,6 +262,8 @@ static bool mxt_object_readable(unsigned int type)
case MXT_PROCG_NOISE:
case MXT_PROCI_ONETOUCH:
case MXT_PROCI_TWOTOUCH:
+ case MXT_PROCI_GRIP:
+ case MXT_PROCI_PALM:
case MXT_SPT_COMMSCONFIG:
case MXT_SPT_GPIOPWM:
case MXT_SPT_SELFTEST:
@@ -282,6 +288,8 @@ static bool mxt_object_writable(unsigned int type)
case MXT_PROCG_NOISE:
case MXT_PROCI_ONETOUCH:
case MXT_PROCI_TWOTOUCH:
+ case MXT_PROCI_GRIP:
+ case MXT_PROCI_PALM:
case MXT_SPT_GPIOPWM:
case MXT_SPT_SELFTEST:
case MXT_SPT_CTECONFIG: