Input: wacom - add reporting of SW_MUTE_DEVICE events

New Intuos series models added a hardware switch to turn touch
data on/off. The state of the switch is reported periodically
from the tablet. To report the state the driver will emit SW_MUTE_DEVICE
events.

Reviewed_by: Chris Bagwell <chris@cnpbagwell.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 8318826d976e..b16ebef5b911 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -1197,6 +1197,8 @@ static void wacom_wireless_work(struct work_struct *work)
                 wacom_wac1->features.device_type = BTN_TOOL_PEN;
                 snprintf(wacom_wac1->name, WACOM_NAME_MAX, "%s (WL) Pen",
                          wacom_wac1->features.name);
+                wacom_wac1->shared->touch_max = wacom_wac1->features.touch_max;
+                wacom_wac1->shared->type = wacom_wac1->features.type;
                 error = wacom_register_input(wacom1);
                 if (error)
                         goto fail;
@@ -1218,6 +1220,10 @@ static void wacom_wireless_work(struct work_struct *work)
                         error = wacom_register_input(wacom2);
                         if (error)
                                 goto fail;
+
+                        if (wacom_wac1->features.type == INTUOSHT &&
+                            wacom_wac1->features.touch_max)
+                                wacom_wac->shared->touch_input = wacom_wac2->input;
                 }
 
                 error = wacom_initialize_battery(wacom);
@@ -1396,6 +1402,12 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
                         goto fail5;
                 }
         }
+
+        if (wacom_wac->features.type == INTUOSHT && wacom_wac->features.touch_max) {
+                if (wacom_wac->features.device_type == BTN_TOOL_FINGER)
+                        wacom_wac->shared->touch_input = wacom_wac->input;
+        }
+
         return 0;
 
  fail5: wacom_destroy_leds(wacom);