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:47:55 +0200
commit312281df5d0259d06b6f256d4c789c996f26bb32 (patch)
treeea3cb6c9f9920d216426587d5544b78685b5e6a8
parent4746c49b11b2403f5b5b07c6eac9e60663dcd9a3 (diff)
downloadlinux-312281df5d0259d06b6f256d4c789c996f26bb32.tar.gz
linux-312281df5d0259d06b6f256d4c789c996f26bb32.tar.bz2
linux-312281df5d0259d06b6f256d4c789c996f26bb32.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 99eabfb4145b..87a92f2654c0 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -2178,6 +2178,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) },