summaryrefslogtreecommitdiffstats
path: root/drivers/hid
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:24:22 +0200
commitabee62676f9eac066077b9ee56055c42417dc756 (patch)
tree98b02c92f08ed09a7d73b71888a39f708c4b9bb2 /drivers/hid
parent6bff6107d1364c95109609c3fd680e6c8d7fa503 (diff)
downloadlinux-stable-abee62676f9eac066077b9ee56055c42417dc756.tar.gz
linux-stable-abee62676f9eac066077b9ee56055c42417dc756.tar.bz2
linux-stable-abee62676f9eac066077b9ee56055c42417dc756.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>
Diffstat (limited to 'drivers/hid')
-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 c20945ed1dc1..e99286258f62 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -2111,6 +2111,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) },