Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / drivers / hid / hid-multitouch.c

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index e2ce790ff4a4c627a64fbdb9fb44cb6b7c5d0a68..3f94b4954225b38ea6fa4bea9194bebb1ab8b383 100644 (file)
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -69,6 +69,7 @@ MODULE_LICENSE("GPL");
 #define MT_QUIRK_ASUS_CUSTOM_UP                BIT(17)
 #define MT_QUIRK_WIN8_PTP_BUTTONS      BIT(18)
 #define MT_QUIRK_SEPARATE_APP_REPORT   BIT(19)
+#define MT_QUIRK_FORCE_MULTI_INPUT     BIT(20)
 
 #define MT_INPUTMODE_TOUCHSCREEN       0x02
 #define MT_INPUTMODE_TOUCHPAD          0x03
@@ -188,7 +189,8 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app);
 /* reserved                                    0x0011 */
 #define MT_CLS_WIN_8                           0x0012
 #define MT_CLS_EXPORT_ALL_INPUTS               0x0013
-#define MT_CLS_WIN_8_DUAL                      0x0014
+/* reserved                                    0x0014 */
+#define MT_CLS_WIN_8_FORCE_MULTI_INPUT         0x0015
 
 /* vendor specific classes */
 #define MT_CLS_3M                              0x0101
@@ -272,12 +274,14 @@ static const struct mt_class mt_classes[] = {
                .quirks = MT_QUIRK_ALWAYS_VALID |
                        MT_QUIRK_CONTACT_CNT_ACCURATE,
                .export_all_inputs = true },
-       { .name = MT_CLS_WIN_8_DUAL,
+       { .name = MT_CLS_WIN_8_FORCE_MULTI_INPUT,
                .quirks = MT_QUIRK_ALWAYS_VALID |
                        MT_QUIRK_IGNORE_DUPLICATES |
                        MT_QUIRK_HOVERING |
                        MT_QUIRK_CONTACT_CNT_ACCURATE |
-                       MT_QUIRK_WIN8_PTP_BUTTONS,
+                       MT_QUIRK_STICKY_FINGERS |
+                       MT_QUIRK_WIN8_PTP_BUTTONS |
+                       MT_QUIRK_FORCE_MULTI_INPUT,
                .export_all_inputs = true },
 
        /*
@@ -754,8 +758,7 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                        MT_STORE_FIELD(inrange_state);
                        return 1;
                case HID_DG_CONFIDENCE:
-                       if ((cls->name == MT_CLS_WIN_8 ||
-                               cls->name == MT_CLS_WIN_8_DUAL) &&
+                       if (cls->name == MT_CLS_WIN_8 &&
                                (field->application == HID_DG_TOUCHPAD ||
                                 field->application == HID_DG_TOUCHSCREEN))
                                app->quirks |= MT_QUIRK_CONFIDENCE;
@@ -1712,6 +1715,11 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
        if (id->group != HID_GROUP_MULTITOUCH_WIN_8)
                hdev->quirks |= HID_QUIRK_MULTI_INPUT;
 
+       if (mtclass->quirks & MT_QUIRK_FORCE_MULTI_INPUT) {
+               hdev->quirks &= ~HID_QUIRK_INPUT_PER_APP;
+               hdev->quirks |= HID_QUIRK_MULTI_INPUT;
+       }
+
        timer_setup(&td->release_timer, mt_expired_timeout, 0);
 
        ret = hid_parse(hdev);
@@ -1784,32 +1792,6 @@ static const struct hid_device_id mt_devices[] = {
                MT_USB_DEVICE(USB_VENDOR_ID_3M,
                        USB_DEVICE_ID_3M3266) },
 
-       /* Alps devices */
-       { .driver_data = MT_CLS_WIN_8_DUAL,
-               HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
-                       USB_VENDOR_ID_ALPS_JP,
-                       HID_DEVICE_ID_ALPS_U1_DUAL_PTP) },
-       { .driver_data = MT_CLS_WIN_8_DUAL,
-               HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
-                       USB_VENDOR_ID_ALPS_JP,
-                       HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) },
-       { .driver_data = MT_CLS_WIN_8_DUAL,
-               HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
-                       USB_VENDOR_ID_ALPS_JP,
-                       HID_DEVICE_ID_ALPS_1222) },
-
-       /* Lenovo X1 TAB Gen 2 */
-       { .driver_data = MT_CLS_WIN_8_DUAL,
-               HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,
-                          USB_VENDOR_ID_LENOVO,
-                          USB_DEVICE_ID_LENOVO_X1_TAB) },
-
-       /* Lenovo X1 TAB Gen 3 */
-       { .driver_data = MT_CLS_WIN_8_DUAL,
-               HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,
-                          USB_VENDOR_ID_LENOVO,
-                          USB_DEVICE_ID_LENOVO_X1_TAB3) },
-
        /* Anton devices */
        { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
                MT_USB_DEVICE(USB_VENDOR_ID_ANTON,
@@ -1844,12 +1826,6 @@ static const struct hid_device_id mt_devices[] = {
                MT_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT,
                        USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },
 
-       /* Cirque devices */
-       { .driver_data = MT_CLS_WIN_8_DUAL,
-               HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
-                       I2C_VENDOR_ID_CIRQUE,
-                       I2C_PRODUCT_ID_CIRQUE_121F) },
-
        /* CJTouch panels */
        { .driver_data = MT_CLS_NSMU,
                MT_USB_DEVICE(USB_VENDOR_ID_CJTOUCH,
@@ -1920,6 +1896,14 @@ static const struct hid_device_id mt_devices[] = {
        { .driver_data = MT_CLS_EGALAX_SERIAL,
                MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
+       { .driver_data = MT_CLS_EGALAX,
+               MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_C002) },
+
+       /* Elan devices */
+       { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,
+               HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
+                       USB_VENDOR_ID_ELAN, 0x313a) },
 
        /* Elitegroup panel */
        { .driver_data = MT_CLS_SERIAL,
@@ -2051,6 +2035,11 @@ static const struct hid_device_id mt_devices[] = {
                MT_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM,
                        USB_DEVICE_ID_MTP_STM)},
 
+       /* Synaptics devices */
+       { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,
+               HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
+                       USB_VENDOR_ID_SYNAPTICS, 0xce08) },
+
        /* TopSeed panels */
        { .driver_data = MT_CLS_TOPSEED,
                MT_USB_DEVICE(USB_VENDOR_ID_TOPSEED2,