diff options
author | Benjamin Tissoires <benjamin.tissoires@enac.fr> | 2011-11-29 07:13:12 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-30 09:38:23 -0500 |
commit | 545803651da8dde248eeb8ce3ed1e547e9e4ac0a (patch) | |
tree | c12a86385b32d4db55d19dc6de364ae54995ef85 /drivers/hid | |
parent | 5e7ea11f603a0aeb77fd1bff0b242931ffe139de (diff) |
HID: hid-multitouch: add support for new Hanvon panels
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
-rw-r--r-- | drivers/hid/hid-multitouch.c | 5 |
3 files changed, 9 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index dd6ec7b7d651..972f6040181f 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1425,6 +1425,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1425 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, | 1425 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, |
1426 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, | 1426 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, |
1427 | { HID_USB_DEVICE(USB_VENDOR_ID_HANVON, USB_DEVICE_ID_HANVON_MULTITOUCH) }, | 1427 | { HID_USB_DEVICE(USB_VENDOR_ID_HANVON, USB_DEVICE_ID_HANVON_MULTITOUCH) }, |
1428 | { HID_USB_DEVICE(USB_VENDOR_ID_HANVON_ALT, USB_DEVICE_ID_HANVON_ALT_MULTITOUCH) }, | ||
1428 | { HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, USB_DEVICE_ID_IDEACOM_IDC6650) }, | 1429 | { HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, USB_DEVICE_ID_IDEACOM_IDC6650) }, |
1429 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) }, | 1430 | { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) }, |
1430 | { HID_USB_DEVICE(USB_VENDOR_ID_ILITEK, USB_DEVICE_ID_ILITEK_MULTITOUCH) }, | 1431 | { HID_USB_DEVICE(USB_VENDOR_ID_ILITEK, USB_DEVICE_ID_ILITEK_MULTITOUCH) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index afa1d87c9ab2..cddb639654cd 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -359,6 +359,9 @@ | |||
359 | #define USB_VENDOR_ID_HANVON 0x20b3 | 359 | #define USB_VENDOR_ID_HANVON 0x20b3 |
360 | #define USB_DEVICE_ID_HANVON_MULTITOUCH 0x0a18 | 360 | #define USB_DEVICE_ID_HANVON_MULTITOUCH 0x0a18 |
361 | 361 | ||
362 | #define USB_VENDOR_ID_HANVON_ALT 0x22ed | ||
363 | #define USB_DEVICE_ID_HANVON_ALT_MULTITOUCH 0x1010 | ||
364 | |||
362 | #define USB_VENDOR_ID_HAPP 0x078b | 365 | #define USB_VENDOR_ID_HAPP 0x078b |
363 | #define USB_DEVICE_ID_UGCI_DRIVING 0x0010 | 366 | #define USB_DEVICE_ID_UGCI_DRIVING 0x0010 |
364 | #define USB_DEVICE_ID_UGCI_FLYING 0x0020 | 367 | #define USB_DEVICE_ID_UGCI_FLYING 0x0020 |
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 3540d32b2b73..de447d7fdc56 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
@@ -735,6 +735,11 @@ static const struct hid_device_id mt_devices[] = { | |||
735 | HID_USB_DEVICE(USB_VENDOR_ID_GOODTOUCH, | 735 | HID_USB_DEVICE(USB_VENDOR_ID_GOODTOUCH, |
736 | USB_DEVICE_ID_GOODTOUCH_000f) }, | 736 | USB_DEVICE_ID_GOODTOUCH_000f) }, |
737 | 737 | ||
738 | /* Hanvon panels */ | ||
739 | { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID, | ||
740 | HID_USB_DEVICE(USB_VENDOR_ID_HANVON_ALT, | ||
741 | USB_DEVICE_ID_HANVON_ALT_MULTITOUCH) }, | ||
742 | |||
738 | /* Ideacom panel */ | 743 | /* Ideacom panel */ |
739 | { .driver_data = MT_CLS_SERIAL, | 744 | { .driver_data = MT_CLS_SERIAL, |
740 | HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, | 745 | HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, |