summary refs log tree commit diff
path: root/drivers/input/tablet/wacom_wac.h
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2013-09-20 09:47:35 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-09-20 09:58:51 -0700
commit36d3c510e6f0a05d6aec6bc54eb708bc6f01c3b4 (patch)
treef0036aeb087a665535e0a89dbf9cb0d38ffd0a64 /drivers/input/tablet/wacom_wac.h
parentc7c8b533c7be077acf6cfee6d0f83ca57b55a19a (diff)
downloadlinux-36d3c510e6f0a05d6aec6bc54eb708bc6f01c3b4.tar.gz
Input: wacom - support EMR and MFT sensors of Cintiq Companion Hybrid
Adds support for the sensors integrated in to the Cintiq Companion
Hybrid. These sensors use by-and-large the same protocol as the
Cintiq 24HD touch.

NOTE: The ExpressKeys on the Cintiq Companion Hybrid are wired to
both the EMR controller and CPU GPIO pins. It may be necessary to
disable their functionality in this driver if building a custom
Android kernel for this device (lest two events be sent to userspace
for every button press).

Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/tablet/wacom_wac.h')
-rw-r--r--drivers/input/tablet/wacom_wac.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index dfc9e08e7f70..90ce10dadb33 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -80,6 +80,7 @@ enum {
 	WACOM_22HD,
 	DTK,
 	WACOM_24HD,
+	CINTIQ_HYBRID,
 	CINTIQ,
 	WACOM_BEE,
 	WACOM_13HD,