Merge branch 'for-4.14/asus' into for-linus

- T100 touchpad support from Hans de Goede

Merge branch 'for-4.14/asus' into for-linus
- T100 touchpad support from Hans de Goede
d3c7ad24 · Jiri Kosina · d487bb6e · 73c75d39 · d3c7ad24 · d3c7ad24
Commit d3c7ad24 authored Sep 05, 2017 by Jiri Kosina
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 175 additions and 45 deletions

drivers/hid/hid-asus.c drivers/hid/hid-asus.c +173 -45

drivers/hid/hid-core.c drivers/hid/hid-core.c +1 -0

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

No files found.
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1982,6 +1982,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD) },
 #endif
 #if IS_ENABLED(CONFIG_HID_AUREAL)
 	{ HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) },

--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -176,6 +176,7 @@
 #define USB_DEVICE_ID_ASUSTEK_LCM	0x1726
 #define USB_DEVICE_ID_ASUSTEK_LCM2	0x175b
 #define USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD	0x17e0
+#define USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD	0x8502
 #define USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD	0x8585
 #define USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD	0x0101
 #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1 0x1854