11 files changed, 242 insertions, 66 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index a421abdd1ab7..bfac1f79757f 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -354,7 +354,9 @@ config HID_MULTITOUCH
          - LG Display panels (Dell ST2220Tc)
          - Lumio CrystalTouch panels
          - MosArt dual-touch panels
+          - Panasonic multitouch panels
          - PenMount dual touch panels
+          - Perixx Peripad 701 touchpad
          - PixArt optical touch screen
          - Pixcir dual touch panels
          - Quanta panels
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index af08ce7207d9..05a0c9a35bf2 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1232,7 +1232,6 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
                hdev->claimed |= HID_CLAIMED_INPUT;
        if (hdev->quirks & HID_QUIRK_MULTITOUCH) {
                /* this device should be handled by hid-multitouch, skip it */
-                hdev->quirks &= ~HID_QUIRK_MULTITOUCH;
                return -ENODEV;
        }
@@ -1409,6 +1408,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) },
@@ -1501,6 +1502,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_PANASONIC, USB_DEVICE_ID_PANABOARD_UBT780) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_PANASONIC, USB_DEVICE_ID_PANABOARD_UBT880) },
        { 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) },
@@ -1663,6 +1666,10 @@ static int hid_bus_match(struct device *dev, struct device_driver *drv)
        struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver);
        struct hid_device *hdev = container_of(dev, struct hid_device, dev);
+        if ((hdev->quirks & HID_QUIRK_MULTITOUCH) &&
+                !strncmp(hdrv->name, "hid-multitouch", 14))
+                return 1;
        if (!hid_match_device(hdev, hdrv))
                return 0;
@@ -1687,8 +1694,11 @@ static int hid_device_probe(struct device *dev)
        if (!hdev->driver) {
                id = hid_match_device(hdev, hdrv);
                if (id == NULL) {
-                        ret = -ENODEV;
+                        if (!((hdev->quirks & HID_QUIRK_MULTITOUCH) &&
-                        goto unlock;
+                                !strncmp(hdrv->name, "hid-multitouch", 14))) {
+                                ret = -ENODEV;
+                                goto unlock;
+                        }
                }
                hdev->driver = hdrv;
diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
index 0c33ae9cf0f0..406632472c1b 100644
--- a/drivers/hid/hid-hyperv.c
+++ b/drivers/hid/hid-hyperv.c
@@ -548,6 +548,7 @@ static int mousevsc_remove(struct hv_device *dev)
        struct mousevsc_dev *input_dev = hv_get_drvdata(dev);
        vmbus_close(dev->channel);
+        hid_hw_stop(input_dev->hid_device);
        hid_destroy_device(input_dev->hid_device);
        mousevsc_free_device(input_dev);
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index b8574cddd953..55360fefee5b 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -41,7 +41,7 @@
 #define USB_VENDOR_ID_ACTIONSTAR        0x2101
 #define USB_DEVICE_ID_ACTIONSTAR_1011   0x1011
-#define USB_VENDOR_ID_ADS_TECH          0x06e1
+#define USB_VENDOR_ID_ADS_TECH          0x06e1
 #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X     0xa155
 #define USB_VENDOR_ID_AFATECH           0x15a4
@@ -59,6 +59,9 @@
 #define USB_VENDOR_ID_AIRCABLE          0x16CA
 #define USB_DEVICE_ID_AIRCABLE1         0x1502
+#define USB_VENDOR_ID_AIREN             0x1a2c
+#define USB_DEVICE_ID_AIREN_SLIMPLUS    0x0002
 #define USB_VENDOR_ID_ALCOR             0x058f
 #define USB_DEVICE_ID_ALCOR_USBRS232    0x9720
@@ -149,6 +152,7 @@
 #define USB_VENDOR_ID_ATMEL             0x03eb
 #define USB_DEVICE_ID_ATMEL_MULTITOUCH  0x211c
+#define USB_DEVICE_ID_ATMEL_MXT_DIGITIZER       0x2118
 #define USB_VENDOR_ID_AVERMEDIA         0x07ca
 #define USB_DEVICE_ID_AVER_FM_MR800     0xb800
@@ -237,11 +241,18 @@
 #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER    0x0001
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D       0x480d
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E       0x480e
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207       0x7207
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C       0x720c
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224       0x7224
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A       0x722A
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E       0x725e
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262       0x7262
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B       0x726b
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA       0x72aa
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1       0x72a1
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA       0x72fa
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302       0x7302
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349       0x7349
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001       0xa001
 #define USB_VENDOR_ID_ELECOM            0x056e
@@ -374,6 +385,7 @@
 #define USB_VENDOR_ID_IDEACOM           0x1cb6
 #define USB_DEVICE_ID_IDEACOM_IDC6650   0x6650
+#define USB_DEVICE_ID_IDEACOM_IDC6651   0x6651
 #define USB_VENDOR_ID_ILITEK            0x222a
 #define USB_DEVICE_ID_ILITEK_MULTITOUCH 0x0001
@@ -565,6 +577,10 @@
 #define USB_DEVICE_ID_ORTEK_PKB1700     0x1700
 #define USB_DEVICE_ID_ORTEK_WKB2000     0x2000
+#define USB_VENDOR_ID_PANASONIC         0x04da
+#define USB_DEVICE_ID_PANABOARD_UBT780  0x1044
+#define USB_DEVICE_ID_PANABOARD_UBT880  0x104d
 #define USB_VENDOR_ID_PANJIT            0x134c
 #define USB_VENDOR_ID_PANTHERLORD       0x0810
@@ -659,6 +675,7 @@
 #define USB_VENDOR_ID_TOPSEED2          0x1784
 #define USB_DEVICE_ID_TOPSEED2_RF_COMBO 0x0004
+#define USB_DEVICE_ID_TOPSEED2_PERIPAD_701      0x0016
 #define USB_VENDOR_ID_TOPMAX            0x0663
 #define USB_DEVICE_ID_TOPMAX_COBRAPAD   0x0103
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 9333d692a786..002781c5a616 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -279,7 +279,8 @@ static enum power_supply_property hidinput_battery_props[] = {
        POWER_SUPPLY_PROP_ONLINE,
        POWER_SUPPLY_PROP_CAPACITY,
        POWER_SUPPLY_PROP_MODEL_NAME,
-        POWER_SUPPLY_PROP_STATUS
+        POWER_SUPPLY_PROP_STATUS,
+        POWER_SUPPLY_PROP_SCOPE,
 };
 #define HID_BATTERY_QUIRK_PERCENT       (1 << 0) /* always reports percent */
@@ -344,6 +345,10 @@ static int hidinput_get_battery_property(struct power_supply *psy,
                val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
                break;
+        case POWER_SUPPLY_PROP_SCOPE:
+                val->intval = POWER_SUPPLY_SCOPE_DEVICE;
+                break;
        default:
                ret = -EINVAL;
                break;
@@ -403,6 +408,8 @@ static bool hidinput_setup_battery(struct hid_device *dev, unsigned report_type,
                battery->name = NULL;
        }
+        power_supply_powers(battery, &dev->dev);
 out:
        return true;
 }
@@ -986,8 +993,13 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
                return;
        }
-        /* Ignore out-of-range values as per HID specification, section 5.10 */
+        /*
-        if (value < field->logical_minimum || value > field->logical_maximum) {
+         * Ignore out-of-range values as per HID specification,
+         * section 5.10 and 6.2.25
+         */
+        if ((field->flags & HID_MAIN_ITEM_VARIABLE) &&
+            (value < field->logical_minimum ||
+             value > field->logical_maximum)) {
                dbg_hid("Ignoring out-of-range value %x\n", value);
                return;
        }
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 24fc4423b937..6fb46d70f39d 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1,9 +1,9 @@
 /*
 *  HID driver for multitouch panels
 *
- *  Copyright (c) 2010-2011 Stephane Chatty <chatty@enac.fr>
+ *  Copyright (c) 2010-2012 Stephane Chatty <chatty@enac.fr>
- *  Copyright (c) 2010-2011 Benjamin Tissoires <benjamin.tissoires@gmail.com>
+ *  Copyright (c) 2010-2012 Benjamin Tissoires <benjamin.tissoires@gmail.com>
- *  Copyright (c) 2010-2011 Ecole Nationale de l'Aviation Civile, France
+ *  Copyright (c) 2010-2012 Ecole Nationale de l'Aviation Civile, France
 *
 *  This code is partly based on hid-egalax.c:
 *
@@ -67,6 +67,7 @@ struct mt_class {
        __s32 sn_height;        /* Signal/noise ratio for height events */
        __s32 sn_pressure;      /* Signal/noise ratio for pressure events */
        __u8 maxcontacts;
+        bool is_indirect;       /* true for touchpads */
 };
 struct mt_device {
@@ -74,11 +75,15 @@ struct mt_device {
        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 */
        __s8 inputmode;         /* InputMode HID feature, -1 if non-existent */
+        __s8 maxcontact_report_id;      /* Maximum Contact Number HID feature,
+                                   -1 if non-existent */
        __u8 num_received;      /* how many contacts we received */
        __u8 num_expected;      /* expected last contact index */
        __u8 maxcontacts;
+        __u8 touches_by_report; /* how many touches are present in one report:
+                                * 1 means we should use a serial protocol
+                                * > 1 means hybrid (multitouch) protocol */
        bool curvalid;          /* is the current contact valid? */
        struct mt_slot *slots;
 };
@@ -100,6 +105,8 @@ struct mt_device {
 #define MT_CLS_CYPRESS                          0x0102
 #define MT_CLS_EGALAX                           0x0103
 #define MT_CLS_EGALAX_SERIAL                    0x0104
+#define MT_CLS_TOPSEED                          0x0105
+#define MT_CLS_PANASONIC                        0x0106
 #define MT_DEFAULT_MAXCONTACT   10
@@ -189,6 +196,14 @@ static struct mt_class mt_classes[] = {
                .sn_move = 4096,
                .sn_pressure = 32,
        },
+        { .name = MT_CLS_TOPSEED,
+                .quirks = MT_QUIRK_ALWAYS_VALID,
+                .is_indirect = true,
+                .maxcontacts = 2,
+        },
+        { .name = MT_CLS_PANASONIC,
+                .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP,
+                .maxcontacts = 4 },
        { }
 };
@@ -241,6 +256,7 @@ static void mt_feature_mapping(struct hid_device *hdev,
                td->inputmode = field->report->id;
                break;
        case HID_DG_CONTACTMAX:
+                td->maxcontact_report_id = field->report->id;
                td->maxcontacts = field->value[0];
                if (td->mtclass.maxcontacts)
                        /* check if the maxcontacts is given by the class */
@@ -259,23 +275,44 @@ static void set_abs(struct input_dev *input, unsigned int code,
        input_set_abs_params(input, code, fmin, fmax, fuzz, 0);
 }
+static void set_last_slot_field(struct hid_usage *usage, struct mt_device *td,
+                struct hid_input *hi)
+{
+        if (!test_bit(usage->hid, hi->input->absbit))
+                td->last_slot_field = usage->hid;
+}
 static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                struct hid_field *field, struct hid_usage *usage,
                unsigned long **bit, int *max)
 {
        struct mt_device *td = hid_get_drvdata(hdev);
        struct mt_class *cls = &td->mtclass;
+        int code;
        /* Only map fields from TouchScreen or TouchPad collections.
-         * We need to ignore fields that belong to other collections
+        * We need to ignore fields that belong to other collections
-         * such as Mouse that might have the same GenericDesktop usages. */
+        * 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)
+        else if (field->application != HID_DG_TOUCHPAD)
-                set_bit(INPUT_PROP_POINTER, hi->input->propbit);
-        else
                return 0;
+        /* In case of an indirect device (touchpad), we need to add
+         * specific BTN_TOOL_* to be handled by the synaptics xorg
+         * driver.
+         * We also consider that touchscreens providing buttons are touchpads.
+         */
+        if (field->application == HID_DG_TOUCHPAD ||
+            (usage->hid & HID_USAGE_PAGE) == HID_UP_BUTTON ||
+            cls->is_indirect) {
+                set_bit(INPUT_PROP_POINTER, hi->input->propbit);
+                set_bit(BTN_TOOL_FINGER, hi->input->keybit);
+                set_bit(BTN_TOOL_DOUBLETAP, hi->input->keybit);
+                set_bit(BTN_TOOL_TRIPLETAP, hi->input->keybit);
+                set_bit(BTN_TOOL_QUADTAP, hi->input->keybit);
+        }
        /* eGalax devices provide a Digitizer.Stylus input which overrides
         * the correct Digitizers.Finger X/Y ranges.
         * Let's just ignore this input. */
@@ -293,10 +330,8 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                                cls->sn_move);
                        /* touchscreen emulation */
                        set_abs(hi->input, ABS_X, field, cls->sn_move);
-                        if (td->last_mt_collection == usage->collection_index) {
+                        set_last_slot_field(usage, td, hi);
-                                td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
-                                td->last_field_index = field->index;
-                        }
                        return 1;
                case HID_GD_Y:
                        hid_map_usage(hi, usage, bit, max,
@@ -305,10 +340,8 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                                cls->sn_move);
                        /* touchscreen emulation */
                        set_abs(hi->input, ABS_Y, field, cls->sn_move);
-                        if (td->last_mt_collection == usage->collection_index) {
+                        set_last_slot_field(usage, td, hi);
-                                td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
-                                td->last_field_index = field->index;
-                        }
                        return 1;
                }
                return 0;
@@ -316,24 +349,18 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
        case HID_UP_DIGITIZER:
                switch (usage->hid) {
                case HID_DG_INRANGE:
-                        if (td->last_mt_collection == usage->collection_index) {
+                        set_last_slot_field(usage, td, hi);
-                                td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
-                                td->last_field_index = field->index;
-                        }
                        return 1;
                case HID_DG_CONFIDENCE:
-                        if (td->last_mt_collection == usage->collection_index) {
+                        set_last_slot_field(usage, td, hi);
-                                td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
-                                td->last_field_index = field->index;
-                        }
                        return 1;
                case HID_DG_TIPSWITCH:
                        hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
                        input_set_capability(hi->input, EV_KEY, BTN_TOUCH);
-                        if (td->last_mt_collection == usage->collection_index) {
+                        set_last_slot_field(usage, td, hi);
-                                td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
-                                td->last_field_index = field->index;
-                        }
                        return 1;
                case HID_DG_CONTACTID:
                        if (!td->maxcontacts)
@@ -341,17 +368,15 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                        input_mt_init_slots(hi->input, td->maxcontacts);
                        td->last_slot_field = usage->hid;
                        td->last_field_index = field->index;
-                        td->last_mt_collection = usage->collection_index;
+                        td->touches_by_report++;
                        return 1;
                case HID_DG_WIDTH:
                        hid_map_usage(hi, usage, bit, max,
                                        EV_ABS, ABS_MT_TOUCH_MAJOR);
                        set_abs(hi->input, ABS_MT_TOUCH_MAJOR, field,
                                cls->sn_width);
-                        if (td->last_mt_collection == usage->collection_index) {
+                        set_last_slot_field(usage, td, hi);
-                                td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
-                                td->last_field_index = field->index;
-                        }
                        return 1;
                case HID_DG_HEIGHT:
                        hid_map_usage(hi, usage, bit, max,
@@ -360,10 +385,8 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                                cls->sn_height);
                        input_set_abs_params(hi->input,
                                        ABS_MT_ORIENTATION, 0, 1, 0, 0);
-                        if (td->last_mt_collection == usage->collection_index) {
+                        set_last_slot_field(usage, td, hi);
-                                td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
-                                td->last_field_index = field->index;
-                        }
                        return 1;
                case HID_DG_TIPPRESSURE:
                        hid_map_usage(hi, usage, bit, max,
@@ -373,25 +396,31 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                        /* touchscreen emulation */
                        set_abs(hi->input, ABS_PRESSURE, field,
                                cls->sn_pressure);
-                        if (td->last_mt_collection == usage->collection_index) {
+                        set_last_slot_field(usage, td, hi);
-                                td->last_slot_field = usage->hid;
+                        td->last_field_index = field->index;
-                                td->last_field_index = field->index;
-                        }
                        return 1;
                case HID_DG_CONTACTCOUNT:
-                        if (td->last_mt_collection == usage->collection_index)
+                        td->last_field_index = field->index;
-                                td->last_field_index = field->index;
                        return 1;
                case HID_DG_CONTACTMAX:
                        /* we don't set td->last_slot_field as contactcount and
                         * contact max are global to the report */
-                        if (td->last_mt_collection == usage->collection_index)
+                        td->last_field_index = field->index;
-                                td->last_field_index = field->index;
                        return -1;
                }
+                case HID_DG_TOUCH:
+                        /* Legacy devices use TIPSWITCH and not TOUCH.
+                         * Let's just ignore this field. */
+                        return -1;
                /* let hid-input decide for the others */
                return 0;
+        case HID_UP_BUTTON:
+                code = BTN_MOUSE + ((usage->hid - 1) & HID_USAGE);
+                hid_map_usage(hi, usage, bit, max, EV_KEY, code);
+                input_set_capability(hi->input, EV_KEY, code);
+                return 1;
        case 0xff000000:
                /* we do not want to map these: no input-oriented meaning */
                return -1;
@@ -538,15 +567,17 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
                        if (value)
                                td->num_expected = value;
                        break;
+                case HID_DG_TOUCH:
+                        /* do nothing */
+                        break;
                default:
                        /* fallback to the generic hidinput handling */
                        return 0;
                }
-                if (usage->hid == td->last_slot_field) {
+                if (usage->hid == td->last_slot_field)
                        mt_complete_slot(td);
-                }
                if (field->index == td->last_field_index
                        && td->num_received >= td->num_expected)
@@ -578,16 +609,44 @@ static void mt_set_input_mode(struct hid_device *hdev)
        }
 }
+static void mt_set_maxcontacts(struct hid_device *hdev)
+{
+        struct mt_device *td = hid_get_drvdata(hdev);
+        struct hid_report *r;
+        struct hid_report_enum *re;
+        int fieldmax, max;
+        if (td->maxcontact_report_id < 0)
+                return;
+        if (!td->mtclass.maxcontacts)
+                return;
+        re = &hdev->report_enum[HID_FEATURE_REPORT];
+        r = re->report_id_hash[td->maxcontact_report_id];
+        if (r) {
+                max = td->mtclass.maxcontacts;
+                fieldmax = r->field[0]->logical_maximum;
+                max = min(fieldmax, max);
+                if (r->field[0]->value[0] != max) {
+                        r->field[0]->value[0] = max;
+                        usbhid_submit_report(hdev, r, USB_DIR_OUT);
+                }
+        }
+}
 static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
        int ret, i;
        struct mt_device *td;
        struct mt_class *mtclass = mt_classes; /* MT_CLS_DEFAULT */
-        for (i = 0; mt_classes[i].name ; i++) {
+        if (id) {
-                if (id->driver_data == mt_classes[i].name) {
+                for (i = 0; mt_classes[i].name ; i++) {
-                        mtclass = &(mt_classes[i]);
+                        if (id->driver_data == mt_classes[i].name) {
-                        break;
+                                mtclass = &(mt_classes[i]);
+                                break;
+                        }
                }
        }
@@ -595,6 +654,7 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
         * that emit events over several HID messages.
         */
        hdev->quirks |= HID_QUIRK_NO_INPUT_SYNC;
+        hdev->quirks &= ~HID_QUIRK_MULTITOUCH;
        td = kzalloc(sizeof(struct mt_device), GFP_KERNEL);
        if (!td) {
@@ -603,7 +663,7 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
        }
        td->mtclass = *mtclass;
        td->inputmode = -1;
-        td->last_mt_collection = -1;
+        td->maxcontact_report_id = -1;
        hid_set_drvdata(hdev, td);
        ret = hid_parse(hdev);
@@ -614,6 +674,15 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
        if (ret)
                goto fail;
+        if (!id && td->touches_by_report == 1) {
+                /* the device has been sent by hid-generic */
+                mtclass = &td->mtclass;
+                mtclass->quirks |= MT_QUIRK_ALWAYS_VALID;
+                mtclass->quirks &= ~MT_QUIRK_NOT_SEEN_MEANS_UP;
+                mtclass->quirks &= ~MT_QUIRK_VALID_IS_INRANGE;
+                mtclass->quirks &= ~MT_QUIRK_VALID_IS_CONFIDENCE;
+        }
        td->slots = kzalloc(td->maxcontacts * sizeof(struct mt_slot),
                                GFP_KERNEL);
        if (!td->slots) {
@@ -625,6 +694,7 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
        ret = sysfs_create_group(&hdev->dev.kobj, &mt_attribute_group);
+        mt_set_maxcontacts(hdev);
        mt_set_input_mode(hdev);
        return 0;
@@ -637,6 +707,7 @@ fail:
 #ifdef CONFIG_PM
 static int mt_reset_resume(struct hid_device *hdev)
 {
+        mt_set_maxcontacts(hdev);
        mt_set_input_mode(hdev);
        return 0;
 }
@@ -674,6 +745,9 @@ static const struct hid_device_id mt_devices[] = {
        { .driver_data = MT_CLS_SERIAL,
                HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,
                        USB_DEVICE_ID_ATMEL_MULTITOUCH) },
+        { .driver_data = MT_CLS_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,
+                        USB_DEVICE_ID_ATMEL_MXT_DIGITIZER) },
        /* Cando panels */
        { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
@@ -716,12 +790,30 @@ static const struct hid_device_id mt_devices[] = {
        { .driver_data = MT_CLS_EGALAX,
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) },
        { .driver_data = MT_CLS_EGALAX,
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262) },
        { .driver_data = MT_CLS_EGALAX,
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA) },
        { .driver_data = MT_CLS_EGALAX,
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA) },
@@ -730,6 +822,9 @@ static const struct hid_device_id mt_devices[] = {
                        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_7349) },
+        { .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 */
@@ -756,6 +851,9 @@ static const struct hid_device_id mt_devices[] = {
        { .driver_data = MT_CLS_SERIAL,
                HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM,
                        USB_DEVICE_ID_IDEACOM_IDC6650) },
+        { .driver_data = MT_CLS_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM,
+                        USB_DEVICE_ID_IDEACOM_IDC6651) },
        /* Ilitek dual touch panel */
        {  .driver_data = MT_CLS_DEFAULT,
@@ -791,6 +889,14 @@ static const struct hid_device_id mt_devices[] = {
                HID_USB_DEVICE(USB_VENDOR_ID_TURBOX,
                        USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART) },
+        /* Panasonic panels */
+        { .driver_data = MT_CLS_PANASONIC,
+                HID_USB_DEVICE(USB_VENDOR_ID_PANASONIC,
+                        USB_DEVICE_ID_PANABOARD_UBT780) },
+        { .driver_data = MT_CLS_PANASONIC,
+                HID_USB_DEVICE(USB_VENDOR_ID_PANASONIC,
+                        USB_DEVICE_ID_PANABOARD_UBT880) },
        /* PenMount panels */
        { .driver_data = MT_CLS_CONFIDENCE,
                HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,
@@ -837,6 +943,11 @@ static const struct hid_device_id mt_devices[] = {
                HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX,
                        USB_DEVICE_ID_MTP_SITRONIX)},
+        /* TopSeed panels */
+        { .driver_data = MT_CLS_TOPSEED,
+                HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2,
+                        USB_DEVICE_ID_TOPSEED2_PERIPAD_701) },
        /* Touch International panels */
        { .driver_data = MT_CLS_DEFAULT,
                HID_USB_DEVICE(USB_VENDOR_ID_TOUCH_INTL,
diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c
index f779009104eb..b71b77ab0dc7 100644
--- a/drivers/hid/hid-prodikeys.c
+++ b/drivers/hid/hid-prodikeys.c
@@ -90,7 +90,7 @@ static const char longname[] = "Prodikeys PC-MIDI Keyboard";
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 module_param_array(index, int, NULL, 0444);
 module_param_array(id, charp, NULL, 0444);
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index f2183486a9b6..acab74cde727 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -49,12 +49,14 @@ static unsigned short batcap[8] = { 1, 15, 25, 35, 50, 70, 100, 0 };
 static enum power_supply_property wacom_battery_props[] = {
        POWER_SUPPLY_PROP_PRESENT,
-        POWER_SUPPLY_PROP_CAPACITY
+        POWER_SUPPLY_PROP_CAPACITY,
+        POWER_SUPPLY_PROP_SCOPE,
 };
 static enum power_supply_property wacom_ac_props[] = {
        POWER_SUPPLY_PROP_PRESENT,
-        POWER_SUPPLY_PROP_ONLINE
+        POWER_SUPPLY_PROP_ONLINE,
+        POWER_SUPPLY_PROP_SCOPE,
 };
 static int wacom_battery_get_property(struct power_supply *psy,
@@ -70,6 +72,9 @@ static int wacom_battery_get_property(struct power_supply *psy,
        case POWER_SUPPLY_PROP_PRESENT:
                val->intval = 1;
                break;
+        case POWER_SUPPLY_PROP_SCOPE:
+                val->intval = POWER_SUPPLY_SCOPE_DEVICE;
+                break;
        case POWER_SUPPLY_PROP_CAPACITY:
                /* show 100% battery capacity when charging */
                if (power_state == 0)
@@ -101,6 +106,9 @@ static int wacom_ac_get_property(struct power_supply *psy,
                else
                        val->intval = 0;
                break;
+        case POWER_SUPPLY_PROP_SCOPE:
+                val->intval = POWER_SUPPLY_SCOPE_DEVICE;
+                break;
        default:
                ret = -EINVAL;
                break;
@@ -523,6 +531,7 @@ static int wacom_probe(struct hid_device *hdev,
        wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
        wdata->battery.use_for_apm = 0;
        ret = power_supply_register(&hdev->dev, &wdata->battery);
        if (ret) {
                hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n",
@@ -530,6 +539,8 @@ static int wacom_probe(struct hid_device *hdev,
                goto err_battery;
        }
+        power_supply_powers(&wdata->battery, &hdev->dev);
        wdata->ac.properties = wacom_ac_props;
        wdata->ac.num_properties = ARRAY_SIZE(wacom_ac_props);
        wdata->ac.get_property = wacom_ac_get_property;
@@ -543,6 +554,8 @@ static int wacom_probe(struct hid_device *hdev,
                         "can't create ac battery attribute, err: %d\n", ret);
                goto err_ac;
        }
+        power_supply_powers(&wdata->ac, &hdev->dev);
 #endif
        return 0;
diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c
index 61881b35c670..cac3589b1ed5 100644
--- a/drivers/hid/hid-wiimote-core.c
+++ b/drivers/hid/hid-wiimote-core.c
@@ -52,7 +52,8 @@ static __u16 wiiproto_keymap[] = {
 };
 static enum power_supply_property wiimote_battery_props[] = {
-        POWER_SUPPLY_PROP_CAPACITY
+        POWER_SUPPLY_PROP_CAPACITY,
+        POWER_SUPPLY_PROP_SCOPE,
 };
 static ssize_t wiimote_hid_send(struct hid_device *hdev, __u8 *buffer,
@@ -402,6 +403,11 @@ static int wiimote_battery_get_property(struct power_supply *psy,
        int ret = 0, state;
        unsigned long flags;
+        if (psp == POWER_SUPPLY_PROP_SCOPE) {
+                val->intval = POWER_SUPPLY_SCOPE_DEVICE;
+                return 0;
+        }
        ret = wiimote_cmd_acquire(wdata);
        if (ret)
                return ret;
@@ -1226,6 +1232,8 @@ static int wiimote_hid_probe(struct hid_device *hdev,
                goto err_battery;
        }
+        power_supply_powers(&wdata->battery, &hdev->dev);
        ret = wiimote_leds_create(wdata);
        if (ret)
                goto err_free;
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index c831af937481..0dd0bebac69f 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -54,6 +54,7 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS, HID_QUIRK_MULTI_INPUT },
+        { USB_VENDOR_ID_AIREN, USB_DEVICE_ID_AIREN_SLIMPLUS, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
@@ -73,6 +74,7 @@ static const struct hid_blacklist {
        { 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_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 7c297d305d5d..b1ec0e2aeb57 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -922,11 +922,11 @@ void hiddev_disconnect(struct hid_device *hid)
        struct hiddev *hiddev = hid->hiddev;
        struct usbhid_device *usbhid = hid->driver_data;
+        usb_deregister_dev(usbhid->intf, &hiddev_class);
        mutex_lock(&hiddev->existancelock);
        hiddev->exist = 0;
-        usb_deregister_dev(usbhid->intf, &hiddev_class);
        if (hiddev->open) {
                mutex_unlock(&hiddev->existancelock);
                usbhid_close(hiddev->hid);