5 files changed, 27 insertions, 0 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index ee14f78139f0..5d6eb4e5af30 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -349,6 +349,7 @@ config HID_MULTITOUCH
           - Lumio CrystalTouch panels
           - MosArt dual-touch panels
           - PenMount dual touch panels
+          - PixArt optical touch screen
           - Pixcir dual touch panels
           - Quanta panels
           - eGalax dual-touch panels, including the Joojoo and Wetab tablets
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 972f6040181f..2f8ad34a6a91 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1501,6 +1501,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
         { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_PCI) },
         { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2) },
         { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_KEYBOARD) },
         { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
         { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index cddb639654cd..96e139f2351b 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -577,6 +577,11 @@
 #define USB_VENDOR_ID_PI_ENGINEERING    0x05f3
 #define USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL  0xff
 
+#define USB_VENDOR_ID_PIXART                            0x093a
+#define USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN       0x8001
+#define USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1      0x8002
+#define USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2      0x8003
+
 #define USB_VENDOR_ID_PLAYDOTCOM        0x0b43
 #define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII      0x0003
 
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index de447d7fdc56..513329d9833f 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -93,6 +93,7 @@ struct mt_device {
 #define MT_CLS_DUAL_INRANGE_CONTACTID           0x0006
 #define MT_CLS_DUAL_INRANGE_CONTACTNUMBER       0x0007
 #define MT_CLS_DUAL_NSMU_CONTACTID              0x0008
+#define MT_CLS_INRANGE_CONTACTNUMBER            0x0009
 
 /* vendor specific classes */
 #define MT_CLS_3M                               0x0101
@@ -159,6 +160,9 @@ struct mt_class mt_classes[] = {
                 .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |
                         MT_QUIRK_SLOT_IS_CONTACTID,
                 .maxcontacts = 2 },
+        { .name = MT_CLS_INRANGE_CONTACTNUMBER,
+                .quirks = MT_QUIRK_VALID_IS_INRANGE |
+                        MT_QUIRK_SLOT_IS_CONTACTNUMBER },
 
         /*
          * vendor specific classes
@@ -784,6 +788,17 @@ static const struct hid_device_id mt_devices[] = {
                 HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,
                         USB_DEVICE_ID_PENMOUNT_PCI) },
 
+        /* PixArt optical touch screen */
+        { .driver_data = MT_CLS_INRANGE_CONTACTNUMBER,
+                HID_USB_DEVICE(USB_VENDOR_ID_PIXART,
+                        USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN) },
+        { .driver_data = MT_CLS_INRANGE_CONTACTNUMBER,
+                HID_USB_DEVICE(USB_VENDOR_ID_PIXART,
+                        USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1) },
+        { .driver_data = MT_CLS_INRANGE_CONTACTNUMBER,
+                HID_USB_DEVICE(USB_VENDOR_ID_PIXART,
+                        USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2) },
+
         /* PixCir-based panels */
         { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
                 HID_USB_DEVICE(USB_VENDOR_ID_HANVON,
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 4ea464151c3b..b7962afa0b82 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -66,6 +66,9 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
+        { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS },
+        { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },
+        { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS },
         { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },