Merge branch 'for-5.19/lenovo' into for-linus

35b4e60e · Jiri Kosina · cf620bda · 5c9b8fae · 35b4e60e · 35b4e60e
Commit 35b4e60e authored May 24, 2022 by Jiri Kosina
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 170 additions and 6 deletions

drivers/hid/hid-ids.h drivers/hid/hid-ids.h +2 -0

drivers/hid/hid-lenovo.c drivers/hid/hid-lenovo.c +168 -6

No files found.
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -761,7 +761,9 @@
 #define USB_VENDOR_ID_LENOVO		0x17ef
 #define USB_DEVICE_ID_LENOVO_TPKBD	0x6009
 #define USB_DEVICE_ID_LENOVO_CUSBKBD	0x6047
+#define USB_DEVICE_ID_LENOVO_TPIIUSBKBD	0x60ee
 #define USB_DEVICE_ID_LENOVO_CBTKBD	0x6048
+#define USB_DEVICE_ID_LENOVO_TPIIBTKBD	0x60e1
 #define USB_DEVICE_ID_LENOVO_SCROLLPOINT_OPTICAL	0x6049
 #define USB_DEVICE_ID_LENOVO_TP10UBKBD	0x6062
 #define USB_DEVICE_ID_LENOVO_TPPRODOCK	0x6067

--- a/drivers/hid/hid-lenovo.c
+++ b/drivers/hid/hid-lenovo.c