| From c50bb1a4005630f47b5da26336f74a485033a515 Mon Sep 17 00:00:00 2001 |
| From: Jeff Brown <jeffbrown@android.com> |
| Date: Mon, 15 Aug 2011 21:12:09 -0700 |
| Subject: HID: hid-multitouch: Add LG Display Multitouch device. |
| |
| From: Jeff Brown <jeffbrown@android.com> |
| |
| commit c50bb1a4005630f47b5da26336f74a485033a515 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/hid/Kconfig | 1 + |
| drivers/hid/hid-core.c | 1 + |
| drivers/hid/hid-ids.h | 3 +++ |
| drivers/hid/hid-multitouch.c | 5 +++++ |
| 4 files changed, 10 insertions(+) |
| |
| --- a/drivers/hid/Kconfig |
| +++ b/drivers/hid/Kconfig |
| @@ -328,6 +328,7 @@ config HID_MULTITOUCH |
| - Hanvon dual touch panels |
| - Ilitek dual touch panels |
| - IrTouch Infrared USB panels |
| + - LG Display panels (Dell ST2220Tc) |
| - Lumio CrystalTouch panels |
| - MosArt dual-touch panels |
| - PenMount dual touch panels |
| --- a/drivers/hid/hid-core.c |
| +++ b/drivers/hid/hid-core.c |
| @@ -1399,6 +1399,7 @@ static const struct hid_device_id hid_ha |
| { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_LG, USB_DEVICE_ID_LG_MULTITOUCH) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) }, |
| --- a/drivers/hid/hid-ids.h |
| +++ b/drivers/hid/hid-ids.h |
| @@ -426,6 +426,9 @@ |
| #define USB_DEVICE_ID_LD_HYBRID 0x2090 |
| #define USB_DEVICE_ID_LD_HEATCONTROL 0x20A0 |
| |
| +#define USB_VENDOR_ID_LG 0x1fd2 |
| +#define USB_DEVICE_ID_LG_MULTITOUCH 0x0064 |
| + |
| #define USB_VENDOR_ID_LOGITECH 0x046d |
| #define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101 |
| #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST 0xc110 |
| --- a/drivers/hid/hid-multitouch.c |
| +++ b/drivers/hid/hid-multitouch.c |
| @@ -672,6 +672,11 @@ static const struct hid_device_id mt_dev |
| HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, |
| USB_DEVICE_ID_IRTOUCH_INFRARED_USB) }, |
| |
| + /* LG Display panels */ |
| + { .driver_data = MT_CLS_DEFAULT, |
| + HID_USB_DEVICE(USB_VENDOR_ID_LG, |
| + USB_DEVICE_ID_LG_MULTITOUCH) }, |
| + |
| /* Lumio panels */ |
| { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE, |
| HID_USB_DEVICE(USB_VENDOR_ID_LUMIO, |