diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2015-10-13 10:03:49 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-10-21 11:18:36 +0200 |
| commit | f7acb55cf1b414f8f515697f2a7bb324ba009062 (patch) | |
| tree | 504464df1cf1ea2a1035a14c615818783a72f148 /drivers/hid/wacom_sys.c | |
| parent | eda01dab53b1126a20da98b5d691f3e55d79f21d (diff) | |
| download | op-kernel-dev-f7acb55cf1b414f8f515697f2a7bb324ba009062.zip op-kernel-dev-f7acb55cf1b414f8f515697f2a7bb324ba009062.tar.gz | |
HID: wacom: Add support for Cintiq Companion 2
Adds support for the EMR (pen+pad) and touchscreen devices used by the
Wacom Cintiq Companion 2. This applies both to using the device as a
standalone system, as well as when operating in "Cintiq mode" (where
the EMR/touchscreen are simply exposed as USB devices to the system
its connected to).
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Clifford Jolly <expiredpopsicle@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_sys.c')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 530476d..125e9d5 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -422,7 +422,7 @@ static int wacom_query_tablet_data(struct hid_device *hdev, /* MT Tablet PC touch */ return wacom_set_device_mode(hdev, 3, 4, 4); } - else if (features->type == WACOM_24HDT || features->type == CINTIQ_HYBRID) { + else if (features->type == WACOM_24HDT || features->type == CINTIQ_HYBRID || features->type == CINTIQ_COMPANION_2) { return wacom_set_device_mode(hdev, 18, 3, 2); } else if (features->type == WACOM_27QHDT) { |
