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

- ThinkPad 10 Ultrabook Keyboard support, from Hans de Goede
mariux64 · Aug 10, 2020 · ccac9ce · ccac9ce
2 parents cd6cad5 + 4942942
commit ccac9ce
Show file tree

Hide file tree

Showing 2 changed files with 282 additions and 79 deletions.
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
@@ -724,6 +724,7 @@
 #define USB_DEVICE_ID_LENOVO_CUSBKBD	0x6047
 #define USB_DEVICE_ID_LENOVO_CBTKBD	0x6048
 #define USB_DEVICE_ID_LENOVO_SCROLLPOINT_OPTICAL	0x6049
+#define USB_DEVICE_ID_LENOVO_TP10UBKBD	0x6062
 #define USB_DEVICE_ID_LENOVO_TPPRODOCK	0x6067
 #define USB_DEVICE_ID_LENOVO_X1_COVER	0x6085
 #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D	0x608d