Linux kernel stable tree (mirror) https://git.radix-linux.su/kernel/linux.git/atom?h=v3.14.47 2015-03-18T12:31:33+00:00 2015-03-18T12:31:33+00:00 Jason Gerecke killertofu@gmail.com 2015-01-22T23:53:28+00:00 urn:sha1:cf0690d1b106d0b9ad99688d7f9cc96d6e7f9977 commit 33e5df0e0e32027866e9fb00451952998fc957f2 upstream. It appears that the Cintiq Companion Hybrid does not send an ABS_MISC event to userspace when any of its ExpressKeys are pressed. This is not strictly necessary now that the pad exists on its own device, but should be fixed for consistency's sake. Traditionally both the stylus and pad shared the same device node, and xf86-input-wacom would use ABS_MISC for disambiguation. Not sending this causes the Hybrid to behave incorrectly with xf86-input-wacom beginning with its 8f44f3 commit. Signed-off-by: Jason Gerecke <killertofu@gmail.com> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> [killertofu@gmail.com: ported to drivers/input/tablet/wacom_wac.c] Signed-off-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2014-01-21T04:36:57+00:00 Ping Cheng pinglinux@gmail.com 2014-01-21T04:18:04+00:00 urn:sha1:497ab1f290a26fa9414c5c316515f1e2ddba0803 Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2014-01-21T04:36:57+00:00 Ping Cheng pinglinux@gmail.com 2014-01-17T00:28:47+00:00 urn:sha1:713481620b60cb311486cac3c38b1185dec31f5d features->quirks can have multiple bits set. For dual input, we only need to check WACOM_QUIRK_MULTI_INPUT. Reviewed-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2014-01-07T07:23:57+00:00 Paul Gortmaker paul.gortmaker@windriver.com 2014-01-06T18:27:05+00:00 urn:sha1:bf9a9f8e5105b13cea954b254008f383ed0b4045 None of these files are actually using any __init type directives and hence don't need to include <linux/init.h>. Most are just a left over from __devinit and __cpuinit removal, or simply due to code getting copied from one driver to the next. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-12-16T10:12:32+00:00 Ping Cheng pinglinux@gmail.com 2013-12-05T20:54:53+00:00 urn:sha1:961794a00eab03f4344b7d5e825e8e789e55da87 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> 2013-12-16T10:04:49+00:00 Dmitry Torokhov dmitry.torokhov@gmail.com 2013-12-16T10:04:49+00:00 urn:sha1:348324c5b10bcba8d9daabdfb85a6927311be34f Synchronize with mainline to bring in the new keycode definitions and new hwmon API. 2013-11-26T03:03:38+00:00 Ping Cheng pinglinux@gmail.com 2013-11-26T02:44:55+00:00 urn:sha1:b5fd2a3e92ca5c8c1f3c20d31ac5daed3ec4d604 Two tablets in this series support both pen and touch. One (Intuos S) only supports pen. This patch also updates the driver to process wireless devices that do not support touch interface. Tested-by: Jason Gerecke <killertofu@gmail.com> Reviewed-by: Chris Bagwell <chris@cnpbagwell.com> Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-11-26T03:03:37+00:00 Ping Cheng pinglinux@gmail.com 2013-11-26T02:43:45+00:00 urn:sha1:1d0d6df02750b4a6f466768cbfbf860e24f4c8d4 Old single touch Tablet PCs do not have touch_max set at wacom_features. Since touch device at lease supports one finger, assign touch_max to 1 when touch usage is defined in its HID Descriptor and touch_max is not pre-defined. Tested-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Ping Cheng <pingc@wacom.com> Reviewed-by: Chris Bagwell <chris@cnpbagwell.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-11-26T03:03:36+00:00 Jason Gerecke killertofu@gmail.com 2013-11-26T02:43:16+00:00 urn:sha1:0b279da7af779fa515b70c0f4127001cab22ea86 The width and height values reported by the Intuos Pro are not in surface units as required by the MT protocol. A simple multiplier of 100x corrects it. Signed-off-by: Jason Gerecke <killertofu@gmail.com> Acked-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-11-15T01:38:05+00:00 Dmitry Torokhov dmitry.torokhov@gmail.com 2013-11-15T01:38:05+00:00 urn:sha1:42249094f79422fbf5ed4b54eeb48ff096809b8f Merge first round of changes for 3.13 merge window.