1 files changed, 169 insertions, 44 deletions

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index f1c909f1b239..24fc4423b937 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -50,7 +50,6 @@ MODULE_LICENSE("GPL");
 #define MT_QUIRK_ALWAYS_VALID           (1 << 4)
 #define MT_QUIRK_VALID_IS_INRANGE       (1 << 5)
 #define MT_QUIRK_VALID_IS_CONFIDENCE    (1 << 6)
-#define MT_QUIRK_EGALAX_XYZ_FIXUP       (1 << 7)
 #define MT_QUIRK_SLOT_IS_CONTACTID_MINUS_ONE    (1 << 8)
 
 struct mt_slot {
@@ -60,9 +59,19 @@ struct mt_slot {
         bool seen_in_this_frame;/* has this slot been updated */
 };
 
+struct mt_class {
+        __s32 name;     /* MT_CLS */
+        __s32 quirks;
+        __s32 sn_move;  /* Signal/noise ratio for move events */
+        __s32 sn_width; /* Signal/noise ratio for width events */
+        __s32 sn_height;        /* Signal/noise ratio for height events */
+        __s32 sn_pressure;      /* Signal/noise ratio for pressure events */
+        __u8 maxcontacts;
+};
+
 struct mt_device {
         struct mt_slot curdata; /* placeholder of incoming data */
-        struct mt_class *mtclass;       /* our mt device class */
+        struct mt_class mtclass;        /* our mt device class */
         unsigned last_field_index;      /* last field index of the report */
         unsigned last_slot_field;       /* the last field of a slot */
         int last_mt_collection; /* last known mt-related collection */
@@ -74,30 +83,23 @@ struct mt_device {
         struct mt_slot *slots;
 };
 
-struct mt_class {
-        __s32 name;     /* MT_CLS */
-        __s32 quirks;
-        __s32 sn_move;  /* Signal/noise ratio for move events */
-        __s32 sn_width; /* Signal/noise ratio for width events */
-        __s32 sn_height;        /* Signal/noise ratio for height events */
-        __s32 sn_pressure;      /* Signal/noise ratio for pressure events */
-        __u8 maxcontacts;
-};
-
 /* classes of device behavior */
 #define MT_CLS_DEFAULT                          0x0001
 
 #define MT_CLS_SERIAL                           0x0002
 #define MT_CLS_CONFIDENCE                       0x0003
-#define MT_CLS_CONFIDENCE_MINUS_ONE             0x0004
-#define MT_CLS_DUAL_INRANGE_CONTACTID           0x0005
-#define MT_CLS_DUAL_INRANGE_CONTACTNUMBER       0x0006
-#define MT_CLS_DUAL_NSMU_CONTACTID              0x0007
+#define MT_CLS_CONFIDENCE_CONTACT_ID            0x0004
+#define MT_CLS_CONFIDENCE_MINUS_ONE             0x0005
+#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
 #define MT_CLS_CYPRESS                          0x0102
 #define MT_CLS_EGALAX                           0x0103
+#define MT_CLS_EGALAX_SERIAL                    0x0104
 
 #define MT_DEFAULT_MAXCONTACT   10
 
@@ -133,13 +135,16 @@ static int find_slot_from_contactid(struct mt_device *td)
         return -1;
 }
 
-struct mt_class mt_classes[] = {
+static struct mt_class mt_classes[] = {
         { .name = MT_CLS_DEFAULT,
                 .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP },
         { .name = MT_CLS_SERIAL,
                 .quirks = MT_QUIRK_ALWAYS_VALID},
         { .name = MT_CLS_CONFIDENCE,
                 .quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
+        { .name = MT_CLS_CONFIDENCE_CONTACT_ID,
+                .quirks = MT_QUIRK_VALID_IS_CONFIDENCE |
+                        MT_QUIRK_SLOT_IS_CONTACTID },
         { .name = MT_CLS_CONFIDENCE_MINUS_ONE,
                 .quirks = MT_QUIRK_VALID_IS_CONFIDENCE |
                         MT_QUIRK_SLOT_IS_CONTACTID_MINUS_ONE },
@@ -155,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
@@ -171,9 +179,13 @@ struct mt_class mt_classes[] = {
                 .maxcontacts = 10 },
         { .name = MT_CLS_EGALAX,
                 .quirks =  MT_QUIRK_SLOT_IS_CONTACTID |
-                        MT_QUIRK_VALID_IS_INRANGE |
-                        MT_QUIRK_EGALAX_XYZ_FIXUP,
-                .maxcontacts = 2,
+                        MT_QUIRK_VALID_IS_INRANGE,
+                .sn_move = 4096,
+                .sn_pressure = 32,
+        },
+        { .name = MT_CLS_EGALAX_SERIAL,
+                .quirks =  MT_QUIRK_SLOT_IS_CONTACTID |
+                        MT_QUIRK_ALWAYS_VALID,
                 .sn_move = 4096,
                 .sn_pressure = 32,
         },
@@ -181,6 +193,44 @@ struct mt_class mt_classes[] = {
         { }
 };
 
+static ssize_t mt_show_quirks(struct device *dev,
+                           struct device_attribute *attr,
+                           char *buf)
+{
+        struct hid_device *hdev = container_of(dev, struct hid_device, dev);
+        struct mt_device *td = hid_get_drvdata(hdev);
+
+        return sprintf(buf, "%u\n", td->mtclass.quirks);
+}
+
+static ssize_t mt_set_quirks(struct device *dev,
+                          struct device_attribute *attr,
+                          const char *buf, size_t count)
+{
+        struct hid_device *hdev = container_of(dev, struct hid_device, dev);
+        struct mt_device *td = hid_get_drvdata(hdev);
+
+        unsigned long val;
+
+        if (kstrtoul(buf, 0, &val))
+                return -EINVAL;
+
+        td->mtclass.quirks = val;
+
+        return count;
+}
+
+static DEVICE_ATTR(quirks, S_IWUSR | S_IRUGO, mt_show_quirks, mt_set_quirks);
+
+static struct attribute *sysfs_attrs[] = {
+        &dev_attr_quirks.attr,
+        NULL
+};
+
+static struct attribute_group mt_attribute_group = {
+        .attrs = sysfs_attrs
+};
+
 static void mt_feature_mapping(struct hid_device *hdev,
                 struct hid_field *field, struct hid_usage *usage)
 {
@@ -192,9 +242,9 @@ static void mt_feature_mapping(struct hid_device *hdev,
                 break;
         case HID_DG_CONTACTMAX:
                 td->maxcontacts = field->value[0];
-                if (td->mtclass->maxcontacts)
+                if (td->mtclass.maxcontacts)
                         /* check if the maxcontacts is given by the class */
-                        td->maxcontacts = td->mtclass->maxcontacts;
+                        td->maxcontacts = td->mtclass.maxcontacts;
 
                 break;
         }
@@ -214,8 +264,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                 unsigned long **bit, int *max)
 {
         struct mt_device *td = hid_get_drvdata(hdev);
-        struct mt_class *cls = td->mtclass;
-        __s32 quirks = cls->quirks;
+        struct mt_class *cls = &td->mtclass;
 
         /* Only map fields from TouchScreen or TouchPad collections.
          * We need to ignore fields that belong to other collections
@@ -227,13 +276,17 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
         else
                 return 0;
 
+        /* eGalax devices provide a Digitizer.Stylus input which overrides
+         * the correct Digitizers.Finger X/Y ranges.
+         * Let's just ignore this input. */
+        if (field->physical == HID_DG_STYLUS)
+                return -1;
+
         switch (usage->hid & HID_USAGE_PAGE) {
 
         case HID_UP_GENDESK:
                 switch (usage->hid) {
                 case HID_GD_X:
-                        if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
-                                field->logical_maximum = 32760;
                         hid_map_usage(hi, usage, bit, max,
                                         EV_ABS, ABS_MT_POSITION_X);
                         set_abs(hi->input, ABS_MT_POSITION_X, field,
@@ -246,8 +299,6 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                         }
                         return 1;
                 case HID_GD_Y:
-                        if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
-                                field->logical_maximum = 32760;
                         hid_map_usage(hi, usage, bit, max,
                                         EV_ABS, ABS_MT_POSITION_Y);
                         set_abs(hi->input, ABS_MT_POSITION_Y, field,
@@ -315,8 +366,6 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                         }
                         return 1;
                 case HID_DG_TIPPRESSURE:
-                        if (quirks & MT_QUIRK_EGALAX_XYZ_FIXUP)
-                                field->logical_minimum = 0;
                         hid_map_usage(hi, usage, bit, max,
                                         EV_ABS, ABS_MT_PRESSURE);
                         set_abs(hi->input, ABS_MT_PRESSURE, field,
@@ -363,7 +412,7 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,
 
 static int mt_compute_slot(struct mt_device *td)
 {
-        __s32 quirks = td->mtclass->quirks;
+        __s32 quirks = td->mtclass.quirks;
 
         if (quirks & MT_QUIRK_SLOT_IS_CONTACTID)
                 return td->curdata.contactid;
@@ -407,7 +456,7 @@ static void mt_emit_event(struct mt_device *td, struct input_dev *input)
 
         for (i = 0; i < td->maxcontacts; ++i) {
                 struct mt_slot *s = &(td->slots[i]);
-                if ((td->mtclass->quirks & MT_QUIRK_NOT_SEEN_MEANS_UP) &&
+                if ((td->mtclass.quirks & MT_QUIRK_NOT_SEEN_MEANS_UP) &&
                         !s->seen_in_this_frame) {
                         s->touch_state = false;
                 }
@@ -444,7 +493,7 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
                                 struct hid_usage *usage, __s32 value)
 {
         struct mt_device *td = hid_get_drvdata(hid);
-        __s32 quirks = td->mtclass->quirks;
+        __s32 quirks = td->mtclass.quirks;
 
         if (hid->claimed & HID_CLAIMED_INPUT && td->slots) {
                 switch (usage->hid) {
@@ -552,7 +601,7 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
                 dev_err(&hdev->dev, "cannot allocate multitouch data\n");
                 return -ENOMEM;
         }
-        td->mtclass = mtclass;
+        td->mtclass = *mtclass;
         td->inputmode = -1;
         td->last_mt_collection = -1;
         hid_set_drvdata(hdev, td);
@@ -574,6 +623,8 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
                 goto fail;
         }
 
+        ret = sysfs_create_group(&hdev->dev.kobj, &mt_attribute_group);
+
         mt_set_input_mode(hdev);
 
         return 0;
@@ -594,6 +645,7 @@ static int mt_reset_resume(struct hid_device *hdev)
 static void mt_remove(struct hid_device *hdev)
 {
         struct mt_device *td = hid_get_drvdata(hdev);
+        sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
         hid_hw_stop(hdev);
         kfree(td->slots);
         kfree(td);
@@ -609,12 +661,20 @@ static const struct hid_device_id mt_devices[] = {
         { .driver_data = MT_CLS_3M,
                 HID_USB_DEVICE(USB_VENDOR_ID_3M,
                         USB_DEVICE_ID_3M2256) },
+        { .driver_data = MT_CLS_3M,
+                HID_USB_DEVICE(USB_VENDOR_ID_3M,
+                        USB_DEVICE_ID_3M3266) },
 
         /* ActionStar panels */
         { .driver_data = MT_CLS_DEFAULT,
                 HID_USB_DEVICE(USB_VENDOR_ID_ACTIONSTAR,
                         USB_DEVICE_ID_ACTIONSTAR_1011) },
 
+        /* Atmel panels */
+        { .driver_data = MT_CLS_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,
+                        USB_DEVICE_ID_ATMEL_MULTITOUCH) },
+
         /* Cando panels */
         { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
                 HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
@@ -645,23 +705,32 @@ static const struct hid_device_id mt_devices[] = {
                         USB_DEVICE_ID_CYPRESS_TRUETOUCH) },
 
         /* eGalax devices (resistive) */
-        {  .driver_data = MT_CLS_EGALAX,
+        { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
-        {  .driver_data = MT_CLS_EGALAX,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },
+        { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },
 
         /* eGalax devices (capacitive) */
-        {  .driver_data = MT_CLS_EGALAX,
+        { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
-        {  .driver_data = MT_CLS_EGALAX,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
+        { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
-        {  .driver_data = MT_CLS_EGALAX,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
+        { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
+        { .driver_data = MT_CLS_EGALAX,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA) },
+        { .driver_data = MT_CLS_EGALAX,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
 
         /* Elo TouchSystems IntelliTouch Plus panel */
         { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
@@ -678,6 +747,11 @@ static const struct hid_device_id mt_devices[] = {
                 HID_USB_DEVICE(USB_VENDOR_ID_GOODTOUCH,
                         USB_DEVICE_ID_GOODTOUCH_000f) },
 
+        /* Hanvon panels */
+        { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
+                HID_USB_DEVICE(USB_VENDOR_ID_HANVON_ALT,
+                        USB_DEVICE_ID_HANVON_ALT_MULTITOUCH) },
+
         /* Ideacom panel */
         { .driver_data = MT_CLS_SERIAL,
                 HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM,
@@ -722,6 +796,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,
@@ -730,6 +815,17 @@ static const struct hid_device_id mt_devices[] = {
                 HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
                         USB_DEVICE_ID_CANDO_PIXCIR_MULTI_TOUCH) },
 
+        /* Quanta-based panels */
+        { .driver_data = MT_CLS_CONFIDENCE_CONTACT_ID,
+                HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,
+                        USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
+        { .driver_data = MT_CLS_CONFIDENCE_CONTACT_ID,
+                HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,
+                        USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001) },
+        { .driver_data = MT_CLS_CONFIDENCE_CONTACT_ID,
+                HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,
+                        USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008) },
+
         /* Stantum panels */
         { .driver_data = MT_CLS_CONFIDENCE,
                 HID_USB_DEVICE(USB_VENDOR_ID_STANTUM,
@@ -758,6 +854,35 @@ static const struct hid_device_id mt_devices[] = {
                 HID_USB_DEVICE(USB_VENDOR_ID_XAT,
                         USB_DEVICE_ID_XAT_CSR) },
 
+        /* Xiroku */
+        { .driver_data = MT_CLS_DEFAULT,
+                HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,
+                        USB_DEVICE_ID_XIROKU_SPX) },
+        { .driver_data = MT_CLS_DEFAULT,
+                HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,
+                        USB_DEVICE_ID_XIROKU_MPX) },
+        { .driver_data = MT_CLS_DEFAULT,
+                HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,
+                        USB_DEVICE_ID_XIROKU_CSR) },
+        { .driver_data = MT_CLS_DEFAULT,
+                HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,
+                        USB_DEVICE_ID_XIROKU_SPX1) },
+        { .driver_data = MT_CLS_DEFAULT,
+                HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,
+                        USB_DEVICE_ID_XIROKU_MPX1) },
+        { .driver_data = MT_CLS_DEFAULT,
+                HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,
+                        USB_DEVICE_ID_XIROKU_CSR1) },
+        { .driver_data = MT_CLS_DEFAULT,
+                HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,
+                        USB_DEVICE_ID_XIROKU_SPX2) },
+        { .driver_data = MT_CLS_DEFAULT,
+                HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,
+                        USB_DEVICE_ID_XIROKU_MPX2) },
+        { .driver_data = MT_CLS_DEFAULT,
+                HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,
+                        USB_DEVICE_ID_XIROKU_CSR2) },
+
         { }
 };
 MODULE_DEVICE_TABLE(hid, mt_devices);