diff options
author | Emanuel Krenz <emanuelkrenz@web.de> | 2013-12-13 08:51:53 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-12-13 08:55:15 -0500 |
commit | 954bb3da814e794f546f55449c508299a127fef8 (patch) | |
tree | 7396612479eebf131ade3826d6d784be55148052 /drivers/hid | |
parent | dcdc50e72b8b8c21aca598705192dcbf96f4fb64 (diff) |
HID: add support for SiS multitouch panel in the touch monitor LG 23ET83V
[jkosina@suse.cz: refresh to apply after SIS quirk merging]
Signed-off-by: Emanuel Krenz <emanuelkrenz@web.de>
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 | 1 | ||||
-rw-r--r-- | drivers/hid/hid-multitouch.c | 3 | ||||
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 36cb475b1934..48296c02ed01 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1824,6 +1824,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1824 | { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) }, | 1824 | { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) }, |
1825 | { HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH) }, | 1825 | { HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH) }, |
1826 | { HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS817_TOUCH) }, | 1826 | { HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS817_TOUCH) }, |
1827 | { HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS1030_TOUCH) }, | ||
1827 | { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) }, | 1828 | { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) }, |
1828 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) }, | 1829 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) }, |
1829 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) }, | 1830 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 92b2ddc83516..c1077ba1bde0 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -760,6 +760,7 @@ | |||
760 | #define USB_DEVICE_ID_SIS9200_TOUCH 0x9200 | 760 | #define USB_DEVICE_ID_SIS9200_TOUCH 0x9200 |
761 | #define USB_DEVICE_ID_SIS817_TOUCH 0x0817 | 761 | #define USB_DEVICE_ID_SIS817_TOUCH 0x0817 |
762 | #define USB_DEVICE_ID_SIS_TS 0x1013 | 762 | #define USB_DEVICE_ID_SIS_TS 0x1013 |
763 | #define USB_DEVICE_ID_SIS1030_TOUCH 0x1030 | ||
763 | 764 | ||
764 | #define USB_VENDOR_ID_SKYCABLE 0x1223 | 765 | #define USB_VENDOR_ID_SKYCABLE 0x1223 |
765 | #define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07 | 766 | #define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07 |
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 9ce8e8b757db..1f0ba5c8e644 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
@@ -1306,6 +1306,9 @@ static const struct hid_device_id mt_devices[] = { | |||
1306 | { .driver_data = MT_CLS_DEFAULT, | 1306 | { .driver_data = MT_CLS_DEFAULT, |
1307 | HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, | 1307 | HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, |
1308 | USB_DEVICE_ID_SIS817_TOUCH) }, | 1308 | USB_DEVICE_ID_SIS817_TOUCH) }, |
1309 | { .driver_data = MT_CLS_DEFAULT, | ||
1310 | HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, | ||
1311 | USB_DEVICE_ID_SIS1030_TOUCH) }, | ||
1309 | 1312 | ||
1310 | /* Stantum panels */ | 1313 | /* Stantum panels */ |
1311 | { .driver_data = MT_CLS_CONFIDENCE, | 1314 | { .driver_data = MT_CLS_CONFIDENCE, |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index b3c7684e8706..175ec0afb70c 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -87,6 +87,7 @@ static const struct hid_blacklist { | |||
87 | { USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH, HID_QUIRK_NOGET }, | 87 | { USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH, HID_QUIRK_NOGET }, |
88 | { USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS817_TOUCH, HID_QUIRK_NOGET }, | 88 | { USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS817_TOUCH, HID_QUIRK_NOGET }, |
89 | { USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS_TS, HID_QUIRK_NO_INIT_REPORTS }, | 89 | { USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS_TS, HID_QUIRK_NO_INIT_REPORTS }, |
90 | { USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS1030_TOUCH, HID_QUIRK_NOGET }, | ||
90 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, | 91 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, |
91 | { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET }, | 92 | { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET }, |
92 | { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET }, | 93 | { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET }, |