aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2011-08-16 00:12:09 -0400
committerJiri Kosina <jkosina@suse.cz>2011-08-16 05:43:53 -0400
commitc50bb1a4005630f47b5da26336f74a485033a515 (patch)
tree820dd1382094322911d75b49f67cc20a0098394d
parent658d4aed59b36f877edc668cc27b188a33e643e5 (diff)
HID: hid-multitouch: Add LG Display Multitouch device.
This panel is also known as the Dell ST2220Tc. Signed-off-by: jeffbrown@android.com Reviewed-By: Benjamin Tissoires <Benjamin_Tissoires@logitech.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/Kconfig1
-rw-r--r--drivers/hid/hid-core.c1
-rw-r--r--drivers/hid/hid-ids.h3
-rw-r--r--drivers/hid/hid-multitouch.c5
4 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 306b15f39c9..3cbe8cc51ef 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -328,6 +328,7 @@ config HID_MULTITOUCH
328 - Hanvon dual touch panels 328 - Hanvon dual touch panels
329 - Ilitek dual touch panels 329 - Ilitek dual touch panels
330 - IrTouch Infrared USB panels 330 - IrTouch Infrared USB panels
331 - LG Display panels (Dell ST2220Tc)
331 - Lumio CrystalTouch panels 332 - Lumio CrystalTouch panels
332 - MosArt dual-touch panels 333 - MosArt dual-touch panels
333 - PenMount dual touch panels 334 - PenMount dual touch panels
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 1a5cf0c9cfc..11b3b39401e 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1396,6 +1396,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1396 { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, 1396 { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },
1397 { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, 1397 { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
1398 { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) }, 1398 { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) },
1399 { HID_USB_DEVICE(USB_VENDOR_ID_LG, USB_DEVICE_ID_LG_MULTITOUCH) },
1399 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) }, 1400 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
1400 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) }, 1401 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
1401 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) }, 1402 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index db63ccf21cc..637e6e96a0d 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -419,6 +419,9 @@
419#define USB_DEVICE_ID_LD_HYBRID 0x2090 419#define USB_DEVICE_ID_LD_HYBRID 0x2090
420#define USB_DEVICE_ID_LD_HEATCONTROL 0x20A0 420#define USB_DEVICE_ID_LD_HEATCONTROL 0x20A0
421 421
422#define USB_VENDOR_ID_LG 0x1fd2
423#define USB_DEVICE_ID_LG_MULTITOUCH 0x0064
424
422#define USB_VENDOR_ID_LOGITECH 0x046d 425#define USB_VENDOR_ID_LOGITECH 0x046d
423#define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101 426#define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101
424#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST 0xc110 427#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST 0xc110
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 4ee21ac8e85..b03a0b0e9b6 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -682,6 +682,11 @@ static const struct hid_device_id mt_devices[] = {
682 HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, 682 HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
683 USB_DEVICE_ID_IRTOUCH_INFRARED_USB) }, 683 USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
684 684
685 /* LG Display panels */
686 { .driver_data = MT_CLS_DEFAULT,
687 HID_USB_DEVICE(USB_VENDOR_ID_LG,
688 USB_DEVICE_ID_LG_MULTITOUCH) },
689
685 /* Lumio panels */ 690 /* Lumio panels */
686 { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE, 691 { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
687 HID_USB_DEVICE(USB_VENDOR_ID_LUMIO, 692 HID_USB_DEVICE(USB_VENDOR_ID_LUMIO,