1 files changed, 48 insertions, 1 deletions

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 89a96427faa0..cecd35c8f0b3 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1044,6 +1044,35 @@ static int wacom_bpt_irq(struct wacom_wac *wacom, size_t len)
         return 0;
 }
 
+static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
+{
+        unsigned char *data = wacom->data;
+        int connected;
+
+        if (len != WACOM_PKGLEN_WIRELESS || data[0] != 0x80)
+                return 0;
+
+        connected = data[1] & 0x01;
+        if (connected) {
+                int pid, battery;
+
+                pid = get_unaligned_be16(&data[6]);
+                battery = data[5] & 0x3f;
+                if (wacom->pid != pid) {
+                        wacom->pid = pid;
+                        wacom_schedule_work(wacom);
+                }
+                wacom->battery_capacity = battery;
+        } else if (wacom->pid != 0) {
+                /* disconnected while previously connected */
+                wacom->pid = 0;
+                wacom_schedule_work(wacom);
+                wacom->battery_capacity = 0;
+        }
+
+        return 0;
+}
+
 void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
 {
         bool sync;
@@ -1094,6 +1123,10 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
                 sync = wacom_bpt_irq(wacom_wac, len);
                 break;
 
+        case WIRELESS:
+                sync = wacom_wireless_irq(wacom_wac, len);
+                break;
+
         default:
                 sync = false;
                 break;
@@ -1155,7 +1188,7 @@ 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 == BAMBOO_PT || features->type == WIRELESS)
                 features->quirks |= WACOM_QUIRK_MULTI_INPUT;
 
         /* quirk for bamboo touch with 2 low res touches */
@@ -1167,6 +1200,16 @@ void wacom_setup_device_quirks(struct wacom_features *features)
                 features->y_fuzz <<= 5;
                 features->quirks |= WACOM_QUIRK_BBTOUCH_LOWRES;
         }
+
+        if (features->type == WIRELESS) {
+
+                /* monitor never has input and pen/touch have delayed create */
+                features->quirks |= WACOM_QUIRK_NO_INPUT;
+
+                /* must be monitor interface if no device_type set */
+                if (!features->device_type)
+                        features->quirks |= WACOM_QUIRK_MONITOR;
+        }
 }
 
 static unsigned int wacom_calculate_touch_res(unsigned int logical_max,
@@ -1640,6 +1683,9 @@ static const struct wacom_features wacom_features_0xEC =
 static const struct wacom_features wacom_features_0x47 =
         { "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023,
           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 };
 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 };
@@ -1766,6 +1812,7 @@ const struct usb_device_id wacom_ids[] = {
         { USB_DEVICE_DETAILED(0xCE, USB_CLASS_HID,
                               USB_INTERFACE_SUBCLASS_BOOT,
                               USB_INTERFACE_PROTOCOL_MOUSE) },
+        { USB_DEVICE_WACOM(0x84) },
         { USB_DEVICE_WACOM(0xD0) },
         { USB_DEVICE_WACOM(0xD1) },
         { USB_DEVICE_WACOM(0xD2) },