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

Pull input layer updates from Dmitry Torokhov:
 - a bunch of new drivers (DA9052/53 touchscreenn controller, Synaptics
   Navpoint, LM8333 keypads, Wacom I2C touhscreen);
 - updates to existing touchpad drivers (ALPS, Sntelic);
 - Wacom driver now supports Intuos5;
 - device-tree bindings in numerous drivers;
 - other cleanups and fixes.

Fix annoying conflict in drivers/input/tablet/wacom_wac.c that I think
implies that the input layer device naming is broken, but let's see.  I
brough it up with Dmitry.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
  Input: matrix-keymap - fix building keymaps
  Input: spear-keyboard - document DT bindings
  Input: spear-keyboard - add device tree bindings
  Input: matrix-keymap - wire up device tree support
  Input: matrix-keymap - uninline and prepare for device tree support
  Input: adp5588 - add support for gpio names
  Input: omap-keypad - dynamically handle register offsets
  Input: synaptics - fix compile warning
  MAINTAINERS: adjust input-related patterns
  Input: ALPS - switch to using input_mt_report_finger_count
  Input: ALPS - add semi-MT support for v4 protocol
  Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver
  Input: atmel_mxt_ts - dump each message on just 1 line
  Input: atmel_mxt_ts - do not read extra (checksum) byte
  Input: atmel_mxt_ts - verify object size in mxt_write_object
  Input: atmel_mxt_ts - only allow root to update firmware
  Input: atmel_mxt_ts - use CONFIG_PM_SLEEP
  Input: sentelic - report device's production serial number
  Input: tl6040-vibra - Device Tree support
  Input: evdev - properly handle read/write with count 0
  ...

5 files changed, 457 insertions, 110 deletions

diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index 755a39e4c9e..ee83c3904ee 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -1862,7 +1862,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
         if (i == ARRAY_SIZE(speeds)) {
                 dev_info(&intf->dev,
                          "Aiptek tried all speeds, no sane response\n");
-                goto fail2;
+                goto fail3;
         }
 
         /* Associate this driver's struct with the usb interface.
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h
index b4842d0e61d..b79d45198d8 100644
--- a/drivers/input/tablet/wacom.h
+++ b/drivers/input/tablet/wacom.h
@@ -135,6 +135,6 @@ extern const struct usb_device_id wacom_ids[];
 
 void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len);
 void wacom_setup_device_quirks(struct wacom_features *features);
-void wacom_setup_input_capabilities(struct input_dev *input_dev,
-                                    struct wacom_wac *wacom_wac);
+int wacom_setup_input_capabilities(struct input_dev *input_dev,
+                                   struct wacom_wac *wacom_wac);
 #endif
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 79a0509882d..cad5602d3ce 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -28,6 +28,7 @@
 #define HID_USAGE_Y_TILT                0x3e
 #define HID_USAGE_FINGER                0x22
 #define HID_USAGE_STYLUS                0x20
+#define HID_USAGE_CONTACTMAX            0x55
 #define HID_COLLECTION                  0xa1
 #define HID_COLLECTION_LOGICAL          0x02
 #define HID_COLLECTION_END              0xc0
@@ -204,6 +205,27 @@ static int wacom_parse_logical_collection(unsigned char *report,
         return length;
 }
 
+static void wacom_retrieve_report_data(struct usb_interface *intf,
+                                       struct wacom_features *features)
+{
+        int result = 0;
+        unsigned char *rep_data;
+
+        rep_data = kmalloc(2, GFP_KERNEL);
+        if (rep_data) {
+
+                rep_data[0] = 12;
+                result = wacom_get_report(intf, WAC_HID_FEATURE_REPORT,
+                                          rep_data[0], &rep_data, 2,
+                                          WAC_MSG_RETRIES);
+
+                if (result >= 0 && rep_data[1] > 2)
+                        features->touch_max = rep_data[1];
+
+                kfree(rep_data);
+        }
+}
+
 /*
  * Interface Descriptor of wacom devices can be incomplete and
  * inconsistent so wacom_features table is used to store stylus
@@ -236,6 +258,9 @@ static int wacom_parse_logical_collection(unsigned char *report,
  * 3rd gen Bamboo Touch no longer define a Digitizer-Finger Pysical
  * Collection. Instead they define a Logical Collection with a single
  * Logical Maximum for both X and Y.
+ *
+ * Intuos5 touch interface does not contain useful data. We deal with
+ * this after returning from this function.
  */
 static int wacom_parse_hid(struct usb_interface *intf,
                            struct hid_descriptor *hid_desc,
@@ -295,6 +320,10 @@ static int wacom_parse_hid(struct usb_interface *intf,
                                                         /* need to reset back */
                                                         features->pktlen = WACOM_PKGLEN_TPC2FG;
                                                 }
+
+                                                if (features->type == MTSCREEN)
+                                                        features->pktlen = WACOM_PKGLEN_MTOUCH;
+
                                                 if (features->type == BAMBOO_PT) {
                                                         /* need to reset back */
                                                         features->pktlen = WACOM_PKGLEN_BBTOUCH;
@@ -327,18 +356,15 @@ static int wacom_parse_hid(struct usb_interface *intf,
                         case HID_USAGE_Y:
                                 if (usage == WCM_DESKTOP) {
                                         if (finger) {
-                                                features->device_type = BTN_TOOL_FINGER;
-                                                if (features->type == TABLETPC2FG) {
-                                                        /* need to reset back */
-                                                        features->pktlen = WACOM_PKGLEN_TPC2FG;
+                                                int type = features->type;
+
+                                                if (type == TABLETPC2FG || type == MTSCREEN) {
                                                         features->y_max =
                                                                 get_unaligned_le16(&report[i + 3]);
                                                         features->y_phy =
                                                                 get_unaligned_le16(&report[i + 6]);
                                                         i += 7;
-                                                } else if (features->type == BAMBOO_PT) {
-                                                        /* need to reset back */
-                                                        features->pktlen = WACOM_PKGLEN_BBTOUCH;
+                                                } else if (type == BAMBOO_PT) {
                                                         features->y_phy =
                                                                 get_unaligned_le16(&report[i + 3]);
                                                         features->y_max =
@@ -352,10 +378,6 @@ static int wacom_parse_hid(struct usb_interface *intf,
                                                         i += 4;
                                                 }
                                         } else if (pen) {
-                                                /* penabled only accepts exact bytes of data */
-                                                if (features->type == TABLETPC2FG)
-                                                        features->pktlen = WACOM_PKGLEN_GRAPHIRE;
-                                                features->device_type = BTN_TOOL_PEN;
                                                 features->y_max =
                                                         get_unaligned_le16(&report[i + 3]);
                                                 i += 4;
@@ -377,6 +399,11 @@ static int wacom_parse_hid(struct usb_interface *intf,
                                 pen = 1;
                                 i++;
                                 break;
+
+                        case HID_USAGE_CONTACTMAX:
+                                wacom_retrieve_report_data(intf, features);
+                                i++;
+                                break;
                         }
                         break;
 
@@ -413,22 +440,29 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat
         if (!rep_data)
                 return error;
 
-        /* ask to report tablet data if it is MT Tablet PC or
-         * not a Tablet PC */
-        if (features->type == TABLETPC2FG) {
-                do {
-                        rep_data[0] = 3;
-                        rep_data[1] = 4;
-                        rep_data[2] = 0;
-                        rep_data[3] = 0;
-                        report_id = 3;
-                        error = wacom_set_report(intf, WAC_HID_FEATURE_REPORT,
-                                                 report_id, rep_data, 4, 1);
-                        if (error >= 0)
-                                error = wacom_get_report(intf,
-                                                WAC_HID_FEATURE_REPORT,
-                                                report_id, rep_data, 4, 1);
-                } while ((error < 0 || rep_data[1] != 4) && limit++ < WAC_MSG_RETRIES);
+        /* ask to report Wacom data */
+        if (features->device_type == BTN_TOOL_FINGER) {
+                /* if it is an MT Tablet PC touch */
+                if (features->type == TABLETPC2FG ||
+                    features->type == MTSCREEN) {
+                        do {
+                                rep_data[0] = 3;
+                                rep_data[1] = 4;
+                                rep_data[2] = 0;
+                                rep_data[3] = 0;
+                                report_id = 3;
+                                error = wacom_set_report(intf,
+                                                         WAC_HID_FEATURE_REPORT,
+                                                         report_id,
+                                                         rep_data, 4, 1);
+                                if (error >= 0)
+                                        error = wacom_get_report(intf,
+                                                        WAC_HID_FEATURE_REPORT,
+                                                        report_id,
+                                                        rep_data, 4, 1);
+                        } while ((error < 0 || rep_data[1] != 4) &&
+                                 limit++ < WAC_MSG_RETRIES);
+                }
         } else if (features->type != TABLETPC &&
                    features->type != WIRELESS &&
                    features->device_type == BTN_TOOL_PEN) {
@@ -450,7 +484,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat
 }
 
 static int wacom_retrieve_hid_descriptor(struct usb_interface *intf,
-                struct wacom_features *features)
+                                         struct wacom_features *features)
 {
         int error = 0;
         struct usb_host_interface *interface = intf->cur_altsetting;
@@ -478,16 +512,21 @@ static int wacom_retrieve_hid_descriptor(struct usb_interface *intf,
                 }
         }
 
-        /* only Tablet PCs and Bamboo P&T need to retrieve the info */
-        if ((features->type != TABLETPC) && (features->type != TABLETPC2FG) &&
-            (features->type != BAMBOO_PT))
+        /* only devices that support touch need to retrieve the info */
+        if (features->type != TABLETPC &&
+            features->type != TABLETPC2FG &&
+            features->type != BAMBOO_PT &&
+            features->type != MTSCREEN) {
                 goto out;
+        }
 
-        if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) {
-                if (usb_get_extra_descriptor(&interface->endpoint[0],
-                                HID_DEVICET_REPORT, &hid_desc)) {
-                        printk("wacom: can not retrieve extra class descriptor\n");
-                        error = 1;
+        error = usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc);
+        if (error) {
+                error = usb_get_extra_descriptor(&interface->endpoint[0],
+                                                 HID_DEVICET_REPORT, &hid_desc);
+                if (error) {
+                        dev_err(&intf->dev,
+                                "can not retrieve extra class descriptor\n");
                         goto out;
                 }
         }
@@ -577,23 +616,39 @@ static void wacom_remove_shared_data(struct wacom_wac *wacom)
 static int wacom_led_control(struct wacom *wacom)
 {
         unsigned char *buf;
-        int retval, led = 0;
+        int retval;
 
         buf = kzalloc(9, GFP_KERNEL);
         if (!buf)
                 return -ENOMEM;
 
-        if (wacom->wacom_wac.features.type == WACOM_21UX2 ||
-            wacom->wacom_wac.features.type == WACOM_24HD)
-                led = (wacom->led.select[1] << 4) | 0x40;
-
-        led |=  wacom->led.select[0] | 0x4;
-
-        buf[0] = WAC_CMD_LED_CONTROL;
-        buf[1] = led;
-        buf[2] = wacom->led.llv;
-        buf[3] = wacom->led.hlv;
-        buf[4] = wacom->led.img_lum;
+        if (wacom->wacom_wac.features.type >= INTUOS5S &&
+            wacom->wacom_wac.features.type <= INTUOS5L) {
+                /*
+                 * Touch Ring and crop mark LED luminance may take on
+                 * one of four values:
+                 *    0 = Low; 1 = Medium; 2 = High; 3 = Off
+                 */
+                int ring_led = wacom->led.select[0] & 0x03;
+                int ring_lum = (((wacom->led.llv & 0x60) >> 5) - 1) & 0x03;
+                int crop_lum = 0;
+
+                buf[0] = WAC_CMD_LED_CONTROL;
+                buf[1] = (crop_lum << 4) | (ring_lum << 2) | (ring_led);
+        }
+        else {
+                int led = wacom->led.select[0] | 0x4;
+
+                if (wacom->wacom_wac.features.type == WACOM_21UX2 ||
+                    wacom->wacom_wac.features.type == WACOM_24HD)
+                        led |= (wacom->led.select[1] << 4) | 0x40;
+
+                buf[0] = WAC_CMD_LED_CONTROL;
+                buf[1] = led;
+                buf[2] = wacom->led.llv;
+                buf[3] = wacom->led.hlv;
+                buf[4] = wacom->led.img_lum;
+        }
 
         retval = wacom_set_report(wacom->intf, 0x03, WAC_CMD_LED_CONTROL,
                                   buf, 9, WAC_CMD_RETRIES);
@@ -786,6 +841,17 @@ static struct attribute_group intuos4_led_attr_group = {
         .attrs = intuos4_led_attrs,
 };
 
+static struct attribute *intuos5_led_attrs[] = {
+        &dev_attr_status0_luminance.attr,
+        &dev_attr_status_led0_select.attr,
+        NULL
+};
+
+static struct attribute_group intuos5_led_attr_group = {
+        .name = "wacom_led",
+        .attrs = intuos5_led_attrs,
+};
+
 static int wacom_initialize_leds(struct wacom *wacom)
 {
         int error;
@@ -815,6 +881,19 @@ static int wacom_initialize_leds(struct wacom *wacom)
                                            &cintiq_led_attr_group);
                 break;
 
+        case INTUOS5S:
+        case INTUOS5:
+        case INTUOS5L:
+                wacom->led.select[0] = 0;
+                wacom->led.select[1] = 0;
+                wacom->led.llv = 32;
+                wacom->led.hlv = 0;
+                wacom->led.img_lum = 0;
+
+                error = sysfs_create_group(&wacom->intf->dev.kobj,
+                                           &intuos5_led_attr_group);
+                break;
+
         default:
                 return 0;
         }
@@ -843,6 +922,13 @@ static void wacom_destroy_leds(struct wacom *wacom)
                 sysfs_remove_group(&wacom->intf->dev.kobj,
                                    &cintiq_led_attr_group);
                 break;
+
+        case INTUOS5S:
+        case INTUOS5:
+        case INTUOS5L:
+                sysfs_remove_group(&wacom->intf->dev.kobj,
+                                   &intuos5_led_attr_group);
+                break;
         }
 }
 
@@ -904,8 +990,10 @@ static int wacom_register_input(struct wacom *wacom)
         int error;
 
         input_dev = input_allocate_device();
-        if (!input_dev)
-                return -ENOMEM;
+        if (!input_dev) {
+                error = -ENOMEM;
+                goto fail1;
+        }
 
         input_dev->name = wacom_wac->name;
         input_dev->dev.parent = &intf->dev;
@@ -915,14 +1003,20 @@ static int wacom_register_input(struct wacom *wacom)
         input_set_drvdata(input_dev, wacom);
 
         wacom_wac->input = input_dev;
-        wacom_setup_input_capabilities(input_dev, wacom_wac);
+        error = wacom_setup_input_capabilities(input_dev, wacom_wac);
+        if (error)
+                goto fail1;
 
         error = input_register_device(input_dev);
-        if (error) {
-                input_free_device(input_dev);
-                wacom_wac->input = NULL;
-        }
+        if (error)
+                goto fail2;
 
+        return 0;
+
+fail2:
+        input_free_device(input_dev);
+        wacom_wac->input = NULL;
+fail1:
         return error;
 }
 
@@ -941,22 +1035,22 @@ static void wacom_wireless_work(struct work_struct *work)
         wacom = usb_get_intfdata(usbdev->config->interface[1]);
         if (wacom->wacom_wac.input)
                 input_unregister_device(wacom->wacom_wac.input);
-        wacom->wacom_wac.input = 0;
+        wacom->wacom_wac.input = NULL;
 
         /* Touch interface */
         wacom = usb_get_intfdata(usbdev->config->interface[2]);
         if (wacom->wacom_wac.input)
                 input_unregister_device(wacom->wacom_wac.input);
-        wacom->wacom_wac.input = 0;
+        wacom->wacom_wac.input = NULL;
 
         if (wacom_wac->pid == 0) {
-                printk(KERN_INFO "wacom: wireless tablet disconnected\n");
+                dev_info(&wacom->intf->dev, "wireless tablet disconnected\n");
         } else {
                 const struct usb_device_id *id = wacom_ids;
 
-                printk(KERN_INFO
-                       "wacom: wireless tablet connected with PID %x\n",
-                       wacom_wac->pid);
+                dev_info(&wacom->intf->dev,
+                         "wireless tablet connected with PID %x\n",
+                         wacom_wac->pid);
 
                 while (id->match_flags) {
                         if (id->idVendor == USB_VENDOR_ID_WACOM &&
@@ -966,8 +1060,8 @@ static void wacom_wireless_work(struct work_struct *work)
                 }
 
                 if (!id->match_flags) {
-                        printk(KERN_INFO
-                               "wacom: ignorning unknown PID.\n");
+                        dev_info(&wacom->intf->dev,
+                                 "ignoring unknown PID.\n");
                         return;
                 }
 
@@ -1038,11 +1132,33 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 
         endpoint = &intf->cur_altsetting->endpoint[0].desc;
 
-        /* Retrieve the physical and logical size for OEM devices */
+        /* Retrieve the physical and logical size for touch devices */
         error = wacom_retrieve_hid_descriptor(intf, features);
         if (error)
                 goto fail3;
 
+        /*
+         * Intuos5 has no useful data about its touch interface in its
+         * HID descriptor. If this is the touch interface (wMaxPacketSize
+         * of WACOM_PKGLEN_BBTOUCH3), override the table values.
+         */
+        if (features->type >= INTUOS5S && features->type <= INTUOS5L) {
+                if (endpoint->wMaxPacketSize == WACOM_PKGLEN_BBTOUCH3) {
+                        features->device_type = BTN_TOOL_FINGER;
+                        features->pktlen = WACOM_PKGLEN_BBTOUCH3;
+
+                        features->x_phy =
+                                (features->x_max * 100) / features->x_resolution;
+                        features->y_phy =
+                                (features->y_max * 100) / features->y_resolution;
+
+                        features->x_max = 4096;
+                        features->y_max = 4096;
+                } else {
+                        features->device_type = BTN_TOOL_PEN;
+                }
+        }
+
         wacom_setup_device_quirks(features);
 
         strlcpy(wacom_wac->name, features->name, sizeof(wacom_wac->name));
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index b327790e9a0..004bc1bb154 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -61,7 +61,8 @@ static int wacom_penpartner_irq(struct wacom_wac *wacom)
                 break;
 
         default:
-                printk(KERN_INFO "wacom_penpartner_irq: received unknown report #%d\n", data[0]);
+                dev_dbg(input->dev.parent,
+                        "%s: received unknown report #%d\n", __func__, data[0]);
                 return 0;
         }
 
@@ -76,8 +77,8 @@ static int wacom_pl_irq(struct wacom_wac *wacom)
         int prox, pressure;
 
         if (data[0] != WACOM_REPORT_PENABLED) {
-                dev_dbg(&input->dev,
-                        "wacom_pl_irq: received unknown report #%d\n", data[0]);
+                dev_dbg(input->dev.parent,
+                        "%s: received unknown report #%d\n", __func__, data[0]);
                 return 0;
         }
 
@@ -147,7 +148,8 @@ static int wacom_ptu_irq(struct wacom_wac *wacom)
         struct input_dev *input = wacom->input;
 
         if (data[0] != WACOM_REPORT_PENABLED) {
-                printk(KERN_INFO "wacom_ptu_irq: received unknown report #%d\n", data[0]);
+                dev_dbg(input->dev.parent,
+                        "%s: received unknown report #%d\n", __func__, data[0]);
                 return 0;
         }
 
@@ -176,7 +178,8 @@ static int wacom_dtu_irq(struct wacom_wac *wacom)
         struct input_dev *input = wacom->input;
         int prox = data[1] & 0x20, pressure;
 
-        dev_dbg(&input->dev, "wacom_dtu_irq: received report #%d\n", data[0]);
+        dev_dbg(input->dev.parent,
+                "%s: received report #%d", __func__, data[0]);
 
         if (prox) {
                 /* Going into proximity select tool */
@@ -212,9 +215,8 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
         int retval = 0;
 
         if (data[0] != WACOM_REPORT_PENABLED) {
-                dev_dbg(&input->dev,
-                        "wacom_graphire_irq: received unknown report #%d\n",
-                        data[0]);
+                dev_dbg(input->dev.parent,
+                        "%s: received unknown report #%d\n", __func__, data[0]);
                 goto exit;
         }
 
@@ -324,6 +326,9 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
 
         /* Enter report */
         if ((data[1] & 0xfc) == 0xc0) {
+                if (features->type >= INTUOS5S && features->type <= INTUOS5L)
+                        wacom->shared->stylus_in_proximity = true;
+
                 /* serial number of the tool */
                 wacom->serial[idx] = ((data[3] & 0x0f) << 28) +
                         (data[4] << 20) + (data[5] << 12) +
@@ -409,6 +414,9 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
 
         /* Exit report */
         if ((data[1] & 0xfe) == 0x80) {
+                if (features->type >= INTUOS5S && features->type <= INTUOS5L)
+                        wacom->shared->stylus_in_proximity = false;
+
                 /*
                  * Reset all states otherwise we lose the initial states
                  * when in-prox next time
@@ -455,6 +463,7 @@ static void wacom_intuos_general(struct wacom_wac *wacom)
         if ((data[1] & 0xb8) == 0xa0) {
                 t = (data[6] << 2) | ((data[7] >> 6) & 3);
                 if ((features->type >= INTUOS4S && features->type <= INTUOS4L) ||
+                    (features->type >= INTUOS5S && features->type <= INTUOS5L) ||
                     features->type == WACOM_21UX2 || features->type == WACOM_24HD) {
                         t = (t << 1) | (data[1] & 1);
                 }
@@ -485,11 +494,13 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
         unsigned int t;
         int idx = 0, result;
 
-        if (data[0] != WACOM_REPORT_PENABLED && data[0] != WACOM_REPORT_INTUOSREAD
-                && data[0] != WACOM_REPORT_INTUOSWRITE && data[0] != WACOM_REPORT_INTUOSPAD) {
-                dev_dbg(&input->dev,
-                        "wacom_intuos_irq: received unknown report #%d\n",
-                        data[0]);
+        if (data[0] != WACOM_REPORT_PENABLED &&
+            data[0] != WACOM_REPORT_INTUOSREAD &&
+            data[0] != WACOM_REPORT_INTUOSWRITE &&
+            data[0] != WACOM_REPORT_INTUOSPAD &&
+            data[0] != WACOM_REPORT_INTUOS5PAD) {
+                dev_dbg(input->dev.parent,
+                        "%s: received unknown report #%d\n", __func__, data[0]);
                 return 0;
         }
 
@@ -498,7 +509,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
                 idx = data[1] & 0x01;
 
         /* pad packets. Works as a second tool and is always in prox */
-        if (data[0] == WACOM_REPORT_INTUOSPAD) {
+        if (data[0] == WACOM_REPORT_INTUOSPAD || data[0] == WACOM_REPORT_INTUOS5PAD) {
                 if (features->type >= INTUOS4S && features->type <= INTUOS4L) {
                         input_report_key(input, BTN_0, (data[2] & 0x01));
                         input_report_key(input, BTN_1, (data[3] & 0x01));
@@ -574,6 +585,34 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
                                 input_report_key(input, wacom->tool[1], 0);
                                 input_report_abs(input, ABS_MISC, 0);
                         }
+                } else if (features->type >= INTUOS5S && features->type <= INTUOS5L) {
+                        int i;
+
+                        /* Touch ring mode switch has no capacitive sensor */
+                        input_report_key(input, BTN_0, (data[3] & 0x01));
+
+                        /*
+                         * ExpressKeys on Intuos5 have a capacitive sensor in
+                         * addition to the mechanical switch. Switch data is
+                         * stored in data[4], capacitive data in data[5].
+                         */
+                        for (i = 0; i < 8; i++)
+                                input_report_key(input, BTN_1 + i, data[4] & (1 << i));
+
+                        if (data[2] & 0x80) {
+                                input_report_abs(input, ABS_WHEEL, (data[2] & 0x7f));
+                        } else {
+                                /* Out of proximity, clear wheel value. */
+                                input_report_abs(input, ABS_WHEEL, 0);
+                        }
+
+                        if (data[2] | (data[3] & 0x01) | data[4]) {
+                                input_report_key(input, wacom->tool[1], 1);
+                                input_report_abs(input, ABS_MISC, PAD_DEVICE_ID);
+                        } else {
+                                input_report_key(input, wacom->tool[1], 0);
+                                input_report_abs(input, ABS_MISC, 0);
+                        }
                 } else {
                         if (features->type == WACOM_21UX2) {
                                 input_report_key(input, BTN_0, (data[5] & 0x01));
@@ -637,7 +676,9 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
             (features->type == INTUOS3 ||
              features->type == INTUOS3S ||
              features->type == INTUOS4 ||
-             features->type == INTUOS4S)) {
+             features->type == INTUOS4S ||
+             features->type == INTUOS5 ||
+             features->type == INTUOS5S)) {
 
                 return 0;
         }
@@ -690,7 +731,8 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
 
                 } else if (wacom->tool[idx] == BTN_TOOL_MOUSE) {
                         /* I4 mouse */
-                        if (features->type >= INTUOS4S && features->type <= INTUOS4L) {
+                        if ((features->type >= INTUOS4S && features->type <= INTUOS4L) ||
+                            (features->type >= INTUOS5S && features->type <= INTUOS5L)) {
                                 input_report_key(input, BTN_LEFT,   data[6] & 0x01);
                                 input_report_key(input, BTN_MIDDLE, data[6] & 0x02);
                                 input_report_key(input, BTN_RIGHT,  data[6] & 0x04);
@@ -717,7 +759,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
                                 }
                         }
                 } else if ((features->type < INTUOS3S || features->type == INTUOS3L ||
-                                features->type == INTUOS4L) &&
+                                features->type == INTUOS4L || features->type == INTUOS5L) &&
                            wacom->tool[idx] == BTN_TOOL_LENS) {
                         /* Lens cursor packets */
                         input_report_key(input, BTN_LEFT,   data[8] & 0x01);
@@ -734,6 +776,72 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
         return 1;
 }
 
+static int find_slot_from_contactid(struct wacom_wac *wacom, int contactid)
+{
+        int touch_max = wacom->features.touch_max;
+        int i;
+
+        if (!wacom->slots)
+                return -1;
+
+        for (i = 0; i < touch_max; ++i) {
+                if (wacom->slots[i] == contactid)
+                        return i;
+        }
+        for (i = 0; i < touch_max; ++i) {
+                if (wacom->slots[i] == -1)
+                        return i;
+        }
+        return -1;
+}
+
+static int wacom_mt_touch(struct wacom_wac *wacom)
+{
+        struct input_dev *input = wacom->input;
+        char *data = wacom->data;
+        int i;
+        int current_num_contacts = data[2];
+        int contacts_to_send = 0;
+
+        /*
+         * First packet resets the counter since only the first
+         * packet in series will have non-zero current_num_contacts.
+         */
+        if (current_num_contacts)
+                wacom->num_contacts_left = current_num_contacts;
+
+        /* There are at most 5 contacts per packet */
+        contacts_to_send = min(5, wacom->num_contacts_left);
+
+        for (i = 0; i < contacts_to_send; i++) {
+                int offset = (WACOM_BYTES_PER_MT_PACKET * i) + 3;
+                bool touch = data[offset] & 0x1;
+                int id = le16_to_cpup((__le16 *)&data[offset + 1]);
+                int slot = find_slot_from_contactid(wacom, id);
+
+                if (slot < 0)
+                        continue;
+
+                input_mt_slot(input, slot);
+                input_mt_report_slot_state(input, MT_TOOL_FINGER, touch);
+                if (touch) {
+                        int x = le16_to_cpup((__le16 *)&data[offset + 7]);
+                        int y = le16_to_cpup((__le16 *)&data[offset + 9]);
+                        input_report_abs(input, ABS_MT_POSITION_X, x);
+                        input_report_abs(input, ABS_MT_POSITION_Y, y);
+                }
+                wacom->slots[slot] = touch ? id : -1;
+        }
+
+        input_mt_report_pointer_emulation(input, true);
+
+        wacom->num_contacts_left -= contacts_to_send;
+        if (wacom->num_contacts_left < 0)
+                wacom->num_contacts_left = 0;
+
+        return 1;
+}
+
 static int wacom_tpc_mt_touch(struct wacom_wac *wacom)
 {
         struct input_dev *input = wacom->input;
@@ -772,6 +880,9 @@ static int wacom_tpc_single_touch(struct wacom_wac *wacom, size_t len)
         bool prox;
         int x = 0, y = 0;
 
+        if (wacom->features.touch_max > 1 || len > WACOM_PKGLEN_TPC2FG)
+                return 0;
+
         if (!wacom->shared->stylus_in_proximity) {
                 if (len == WACOM_PKGLEN_TPC1FG) {
                         prox = data[0] & 0x01;
@@ -835,15 +946,15 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)
 {
         char *data = wacom->data;
 
-        dev_dbg(&wacom->input->dev, "wacom_tpc_irq: received report #%d\n",
-                data[0]);
+        dev_dbg(wacom->input->dev.parent,
+                "%s: received report #%d\n", __func__, data[0]);
 
         switch (len) {
         case WACOM_PKGLEN_TPC1FG:
-                 return wacom_tpc_single_touch(wacom, len);
+                return wacom_tpc_single_touch(wacom, len);
 
         case WACOM_PKGLEN_TPC2FG:
-                return wacom_tpc_mt_touch(wacom);
+                return wacom_tpc_mt_touch(wacom);
 
         default:
                 switch (data[0]) {
@@ -852,6 +963,9 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)
                 case WACOM_REPORT_TPCST:
                         return wacom_tpc_single_touch(wacom, len);
 
+                case WACOM_REPORT_TPCMT:
+                        return wacom_mt_touch(wacom);
+
                 case WACOM_REPORT_PENABLED:
                         return wacom_tpc_pen(wacom);
                 }
@@ -1120,8 +1234,18 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
                 sync = wacom_intuos_irq(wacom_wac);
                 break;
 
+        case INTUOS5S:
+        case INTUOS5:
+        case INTUOS5L:
+                if (len == WACOM_PKGLEN_BBTOUCH3)
+                        sync = wacom_bpt3_touch(wacom_wac);
+                else
+                        sync = wacom_intuos_irq(wacom_wac);
+                break;
+
         case TABLETPC:
         case TABLETPC2FG:
+        case MTSCREEN:
                 sync = wacom_tpc_irq(wacom_wac, len);
                 break;
 
@@ -1194,7 +1318,9 @@ void wacom_setup_device_quirks(struct wacom_features *features)
 
         /* these device have multiple inputs */
         if (features->type == TABLETPC || features->type == TABLETPC2FG ||
-            features->type == BAMBOO_PT || features->type == WIRELESS)
+            features->type == BAMBOO_PT || features->type == WIRELESS ||
+            (features->type >= INTUOS5S && features->type <= INTUOS5L) ||
+            features->type == MTSCREEN)
                 features->quirks |= WACOM_QUIRK_MULTI_INPUT;
 
         /* quirk for bamboo touch with 2 low res touches */
@@ -1225,8 +1351,8 @@ static unsigned int wacom_calculate_touch_res(unsigned int logical_max,
        return (logical_max * 100) / physical_max;
 }
 
-void wacom_setup_input_capabilities(struct input_dev *input_dev,
-                                    struct wacom_wac *wacom_wac)
+int wacom_setup_input_capabilities(struct input_dev *input_dev,
+                                   struct wacom_wac *wacom_wac)
 {
         struct wacom_features *features = &wacom_wac->features;
         int i;
@@ -1361,6 +1487,50 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
                 wacom_setup_intuos(wacom_wac);
                 break;
 
+        case INTUOS5:
+        case INTUOS5L:
+                if (features->device_type == BTN_TOOL_PEN) {
+                        __set_bit(BTN_7, input_dev->keybit);
+                        __set_bit(BTN_8, input_dev->keybit);
+                }
+                /* fall through */
+
+        case INTUOS5S:
+                __set_bit(INPUT_PROP_POINTER, input_dev->propbit);
+
+                if (features->device_type == BTN_TOOL_PEN) {
+                        for (i = 0; i < 7; i++)
+                                __set_bit(BTN_0 + i, input_dev->keybit);
+
+                        input_set_abs_params(input_dev, ABS_DISTANCE, 0,
+                                              features->distance_max,
+                                              0, 0);
+
+                        input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
+
+                        wacom_setup_intuos(wacom_wac);
+                } else if (features->device_type == BTN_TOOL_FINGER) {
+                        __clear_bit(ABS_MISC, input_dev->absbit);
+
+                        __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
+                        __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
+                        __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
+                        __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit);
+
+                        input_mt_init_slots(input_dev, features->touch_max);
+
+                        input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
+                                             0, 255, 0, 0);
+
+                        input_set_abs_params(input_dev, ABS_MT_POSITION_X,
+                                             0, features->x_max,
+                                             features->x_fuzz, 0);
+                        input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
+                                             0, features->y_max,
+                                             features->y_fuzz, 0);
+                }
+                break;
+
         case INTUOS4:
         case INTUOS4L:
                 __set_bit(BTN_7, input_dev->keybit);
@@ -1378,9 +1548,19 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
                 break;
 
         case TABLETPC2FG:
+        case MTSCREEN:
                 if (features->device_type == BTN_TOOL_FINGER) {
 
-                        input_mt_init_slots(input_dev, 2);
+                        wacom_wac->slots = kmalloc(features->touch_max *
+                                                        sizeof(int),
+                                                   GFP_KERNEL);
+                        if (!wacom_wac->slots)
+                                return -ENOMEM;
+
+                        for (i = 0; i < features->touch_max; i++)
+                                wacom_wac->slots[i] = -1;
+
+                        input_mt_init_slots(input_dev, features->touch_max);
                         input_set_abs_params(input_dev, ABS_MT_TOOL_TYPE,
                                         0, MT_TOOL_MAX, 0, 0);
                         input_set_abs_params(input_dev, ABS_MT_POSITION_X,
@@ -1435,6 +1615,7 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
 
                         __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
                         __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
+                        input_mt_init_slots(input_dev, features->touch_max);
 
                         if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) {
                                 __set_bit(BTN_TOOL_TRIPLETAP,
@@ -1442,13 +1623,9 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
                                 __set_bit(BTN_TOOL_QUADTAP,
                                           input_dev->keybit);
 
-                                input_mt_init_slots(input_dev, 16);
-
                                 input_set_abs_params(input_dev,
                                                      ABS_MT_TOUCH_MAJOR,
                                                      0, 255, 0, 0);
-                        } else {
-                                input_mt_init_slots(input_dev, 2);
                         }
 
                         input_set_abs_params(input_dev, ABS_MT_POSITION_X,
@@ -1468,6 +1645,7 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
                 }
                 break;
         }
+        return 0;
 }
 
 static const struct wacom_features wacom_features_0x00 =
@@ -1635,6 +1813,24 @@ static const struct wacom_features wacom_features_0xBB =
 static const struct wacom_features wacom_features_0xBC =
         { "Wacom Intuos4 WL",     WACOM_PKGLEN_INTUOS,    40840, 25400, 2047,
           63, INTUOS4, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+static const struct wacom_features wacom_features_0x26 =
+        { "Wacom Intuos5 touch S", WACOM_PKGLEN_INTUOS,  31496, 19685, 2047,
+          63, INTUOS5S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          .touch_max = 16 };
+static const struct wacom_features wacom_features_0x27 =
+        { "Wacom Intuos5 touch M", WACOM_PKGLEN_INTUOS,  44704, 27940, 2047,
+          63, INTUOS5, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          .touch_max = 16 };
+static const struct wacom_features wacom_features_0x28 =
+        { "Wacom Intuos5 touch L", WACOM_PKGLEN_INTUOS, 65024, 40640, 2047,
+          63, INTUOS5L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          .touch_max = 16 };
+static const struct wacom_features wacom_features_0x29 =
+        { "Wacom Intuos5 S", WACOM_PKGLEN_INTUOS,  31496, 19685, 2047,
+          63, INTUOS5S, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
+static const struct wacom_features wacom_features_0x2A =
+        { "Wacom Intuos5 M", WACOM_PKGLEN_INTUOS,  44704, 27940, 2047,
+          63, INTUOS5, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0xF4 =
         { "Wacom Cintiq 24HD",    WACOM_PKGLEN_INTUOS,   104480, 65600, 2047,
           63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
@@ -1676,13 +1872,19 @@ static const struct wacom_features wacom_features_0x9F =
           0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xE2 =
         { "Wacom ISDv4 E2",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,
-          0, TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          0, TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          .touch_max = 2 };
 static const struct wacom_features wacom_features_0xE3 =
         { "Wacom ISDv4 E3",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,
-          0, TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          0, TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          .touch_max = 2 };
+static const struct wacom_features wacom_features_0xE5 =
+        { "Wacom ISDv4 E5",       WACOM_PKGLEN_MTOUCH,    26202, 16325,  255,
+          0, MTSCREEN, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xE6 =
         { "Wacom ISDv4 E6",       WACOM_PKGLEN_TPC2FG,    27760, 15694,  255,
-          0, TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          0, TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+        .touch_max = 2 };
 static const struct wacom_features wacom_features_0xEC =
         { "Wacom ISDv4 EC",       WACOM_PKGLEN_GRAPHIRE,  25710, 14500,  255,
           0, TABLETPC,    WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -1691,19 +1893,22 @@ static const struct wacom_features wacom_features_0x47 =
           31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x84 =
         { "Wacom Wireless Receiver", WACOM_PKGLEN_WIRELESS, 0, 0, 0,
-          0, WIRELESS, 0, 0 };
+          0, WIRELESS, 0, 0, .touch_max = 16 };
 static const struct wacom_features wacom_features_0xD0 =
         { "Wacom Bamboo 2FG",     WACOM_PKGLEN_BBFUN,     14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          .touch_max = 2 };
 static const struct wacom_features wacom_features_0xD1 =
         { "Wacom Bamboo 2FG 4x5", WACOM_PKGLEN_BBFUN,     14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          .touch_max = 2 };
 static const struct wacom_features wacom_features_0xD2 =
         { "Wacom Bamboo Craft",   WACOM_PKGLEN_BBFUN,     14720,  9200, 1023,
           31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xD3 =
         { "Wacom Bamboo 2FG 6x8", WACOM_PKGLEN_BBFUN,     21648, 13700, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          .touch_max = 2 };
 static const struct wacom_features wacom_features_0xD4 =
         { "Wacom Bamboo Pen",     WACOM_PKGLEN_BBFUN,     14720,  9200, 1023,
           31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -1712,28 +1917,35 @@ static const struct wacom_features wacom_features_0xD5 =
           31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xD6 =
         { "Wacom BambooPT 2FG 4x5", WACOM_PKGLEN_BBFUN,   14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          .touch_max = 2 };
 static const struct wacom_features wacom_features_0xD7 =
         { "Wacom BambooPT 2FG Small", WACOM_PKGLEN_BBFUN, 14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          .touch_max = 2 };
 static const struct wacom_features wacom_features_0xD8 =
         { "Wacom Bamboo Comic 2FG", WACOM_PKGLEN_BBFUN,   21648, 13700, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          .touch_max = 2 };
 static const struct wacom_features wacom_features_0xDA =
         { "Wacom Bamboo 2FG 4x5 SE", WACOM_PKGLEN_BBFUN,  14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          .touch_max = 2 };
 static struct wacom_features wacom_features_0xDB =
         { "Wacom Bamboo 2FG 6x8 SE", WACOM_PKGLEN_BBFUN,  21648, 13700, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          .touch_max = 2 };
 static const struct wacom_features wacom_features_0xDD =
         { "Wacom Bamboo Connect", WACOM_PKGLEN_BBPEN,     14720,  9200, 1023,
           31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xDE =
         { "Wacom Bamboo 16FG 4x5", WACOM_PKGLEN_BBPEN,    14720,  9200, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          .touch_max = 16 };
 static const struct wacom_features wacom_features_0xDF =
         { "Wacom Bamboo 16FG 6x8", WACOM_PKGLEN_BBPEN,    21648, 13700, 1023,
-          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          .touch_max = 16 };
 static const struct wacom_features wacom_features_0x6004 =
         { "ISD-V4",               WACOM_PKGLEN_GRAPHIRE,  12800,  8000,  255,
           0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -1807,6 +2019,11 @@ const struct usb_device_id wacom_ids[] = {
         { USB_DEVICE_WACOM(0xBA) },
         { USB_DEVICE_WACOM(0xBB) },
         { USB_DEVICE_WACOM(0xBC) },
+        { USB_DEVICE_WACOM(0x26) },
+        { USB_DEVICE_WACOM(0x27) },
+        { USB_DEVICE_WACOM(0x28) },
+        { USB_DEVICE_WACOM(0x29) },
+        { USB_DEVICE_WACOM(0x2A) },
         { USB_DEVICE_WACOM(0x3F) },
         { USB_DEVICE_WACOM(0xC5) },
         { USB_DEVICE_WACOM(0xC6) },
@@ -1842,6 +2059,7 @@ const struct usb_device_id wacom_ids[] = {
         { USB_DEVICE_WACOM(0x9F) },
         { USB_DEVICE_WACOM(0xE2) },
         { USB_DEVICE_WACOM(0xE3) },
+        { USB_DEVICE_WACOM(0xE5) },
         { USB_DEVICE_WACOM(0xE6) },
         { USB_DEVICE_WACOM(0xEC) },
         { USB_DEVICE_WACOM(0x47) },
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index ba5a334e54d..78fbd3f4200 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -25,6 +25,10 @@
 #define WACOM_PKGLEN_BBTOUCH3   64
 #define WACOM_PKGLEN_BBPEN      10
 #define WACOM_PKGLEN_WIRELESS   32
+#define WACOM_PKGLEN_MTOUCH     62
+
+/* wacom data size per MT contact */
+#define WACOM_BYTES_PER_MT_PACKET       11
 
 /* device IDs */
 #define STYLUS_DEVICE_ID        0x02
@@ -38,8 +42,10 @@
 #define WACOM_REPORT_INTUOSREAD         5
 #define WACOM_REPORT_INTUOSWRITE        6
 #define WACOM_REPORT_INTUOSPAD          12
+#define WACOM_REPORT_INTUOS5PAD         3
 #define WACOM_REPORT_TPC1FG             6
 #define WACOM_REPORT_TPC2FG             13
+#define WACOM_REPORT_TPCMT              13
 #define WACOM_REPORT_TPCHID             15
 #define WACOM_REPORT_TPCST              16
 
@@ -65,6 +71,9 @@ enum {
         INTUOS4S,
         INTUOS4,
         INTUOS4L,
+        INTUOS5S,
+        INTUOS5,
+        INTUOS5L,
         WACOM_24HD,
         WACOM_21UX2,
         CINTIQ,
@@ -72,6 +81,7 @@ enum {
         WACOM_MO,
         TABLETPC,
         TABLETPC2FG,
+        MTSCREEN,
         MAX_TYPE
 };
 
@@ -95,6 +105,7 @@ struct wacom_features {
         int pressure_fuzz;
         int distance_fuzz;
         unsigned quirks;
+        unsigned touch_max;
 };
 
 struct wacom_shared {
@@ -113,6 +124,8 @@ struct wacom_wac {
         struct input_dev *input;
         int pid;
         int battery_capacity;
+        int num_contacts_left;
+        int *slots;
 };
 
 #endif