1 files changed, 19 insertions, 0 deletions

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 62cac4dc3b6..b03a0b0e9b6 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -213,6 +213,16 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
         struct mt_class *cls = td->mtclass;
         __s32 quirks = cls->quirks;
 
+        /* Only map fields from TouchScreen or TouchPad collections.
+         * We need to ignore fields that belong to other collections
+         * such as Mouse that might have the same GenericDesktop usages. */
+        if (field->application == HID_DG_TOUCHSCREEN)
+                set_bit(INPUT_PROP_DIRECT, hi->input->propbit);
+        else if (field->application == HID_DG_TOUCHPAD)
+                set_bit(INPUT_PROP_POINTER, hi->input->propbit);
+        else
+                return 0;
+
         switch (usage->hid & HID_USAGE_PAGE) {
 
         case HID_UP_GENDESK:
@@ -672,6 +682,11 @@ static const struct hid_device_id mt_devices[] = {
                 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,
@@ -727,6 +742,10 @@ static const struct hid_device_id mt_devices[] = {
         { .driver_data = MT_CLS_DEFAULT,
                 HID_USB_DEVICE(USB_VENDOR_ID_UNITEC,
                         USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },
+        /* XAT */
+        { .driver_data = MT_CLS_DEFAULT,
+                HID_USB_DEVICE(USB_VENDOR_ID_XAT,
+                        USB_DEVICE_ID_XAT_CSR) },
 
         { }
 };