Commit 7ff6dae4 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.1/hid-topseed' into for-linus 

Toshiba WT10A tablet bluetooth keyboard support from Hans de Goede
parents 97809a31 aa2d495f

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ 
#define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE	0x1053

#define USB_DEVICE_ID_CHICONY_WIRELESS2	0x1123

#define USB_DEVICE_ID_ASUS_AK1D		0x1125

#define USB_DEVICE_ID_CHICONY_TOSHIBA_WT10A	0x1408

#define USB_DEVICE_ID_CHICONY_ACER_SWITCH12	0x1421



#define USB_VENDOR_ID_CHUNGHWAT		0x2247

drivers/hid/hid-topseed.c

+3 −0
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ static int ts_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
		return 0;



	switch (usage->hid & HID_USAGE) {

	case 0x00c: ts_map_key_clear(KEY_WLAN);		break;

	case 0x00d: ts_map_key_clear(KEY_MEDIA);	break;

	case 0x010: ts_map_key_clear(KEY_ZOOM);		break;

	case 0x024: ts_map_key_clear(KEY_MENU);		break;

	case 0x025: ts_map_key_clear(KEY_TV);		break;

	case 0x027: ts_map_key_clear(KEY_MODE);		break;
@@ -67,6 +69,7 @@ static const struct hid_device_id ts_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TOSHIBA_WT10A) },

	{ }

};

MODULE_DEVICE_TABLE(hid, ts_devices);