summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Maślanka <mm@semihalf.com>2022-04-05 17:04:07 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-06 08:33:51 +0200
commit396d1f51764dc4b5d77af2e15b52d9c1e8e04a7c (patch)
tree417e7cd4a2007b4a8286ccaf094ad2c797a83006
parent25f0e9459f94f67d3d8222ddd785e35485757735 (diff)
downloadlinux-396d1f51764dc4b5d77af2e15b52d9c1e8e04a7c.tar.gz
linux-396d1f51764dc4b5d77af2e15b52d9c1e8e04a7c.tar.bz2
linux-396d1f51764dc4b5d77af2e15b52d9c1e8e04a7c.zip
HID: multitouch: Add support for Google Whiskers Touchpad
commit 1d07cef7fd7599450b3d03e1915efc2a96e1f03f upstream. The Google Whiskers touchpad does not work properly with the default multitouch configuration. Instead, use the same configuration as Google Rose. Signed-off-by: Marek Maslanka <mm@semihalf.com> Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/hid/hid-multitouch.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 37270b8f4e58..653f436aa459 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -2158,6 +2158,9 @@ static const struct hid_device_id mt_devices[] = {
{ .driver_data = MT_CLS_GOOGLE,
HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
USB_DEVICE_ID_GOOGLE_TOUCH_ROSE) },
+ { .driver_data = MT_CLS_GOOGLE,
+ HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8, USB_VENDOR_ID_GOOGLE,
+ USB_DEVICE_ID_GOOGLE_WHISKERS) },
/* Generic MT device */
{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) },