Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9929ffed authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'upstream-fixes' into for-linus 

Conflicts:
	drivers/hid/hid-ids.h
parents fc73697b d5e0a06f

drivers/hid/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -423,10 +423,11 @@ config SMARTJOYPLUS_FF 
	enable force feedback support for it.



config HID_TOPSEED

	tristate "TopSeed Cyberlink remote control support"

	tristate "TopSeed Cyberlink, BTC Emprex, Conceptronic remote control support"

	depends on USB_HID

	---help---

	Say Y if you have a TopSeed Cyberlink or BTC Emprex remote control.

	Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic

	CLLRCMCE remote control.



config HID_THRUSTMASTER

	tristate "ThrustMaster devices support"

drivers/hid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1376,10 +1376,10 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) },

drivers/hid/hid-ids.h

+6 −4
Original line number Diff line number Diff line
@@ -479,12 +479,15 @@ 


#define USB_VENDOR_ID_THRUSTMASTER	0x044f



#define USB_VENDOR_ID_TOPMAX		0x0663

#define USB_DEVICE_ID_TOPMAX_COBRAPAD	0x0103



#define USB_VENDOR_ID_TOPSEED		0x0766

#define USB_DEVICE_ID_TOPSEED_CYBERLINK	0x0204



#define USB_VENDOR_ID_TOPSEED2		0x1784

#define USB_DEVICE_ID_TOPSEED2_RF_COMBO	0x0004



#define USB_VENDOR_ID_TOPMAX		0x0663

#define USB_DEVICE_ID_TOPMAX_COBRAPAD	0x0103



#define USB_VENDOR_ID_TOUCHPACK		0x1bfd

#define USB_DEVICE_ID_TOUCHPACK_RTS	0x1688
@@ -507,7 +510,6 @@ 


#define USB_VENDOR_ID_WACOM		0x056a

#define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH	0x81

#define USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH	0xbd



#define USB_VENDOR_ID_WISEGROUP		0x0925

#define USB_DEVICE_ID_SMARTJOY_PLUS	0x0005

drivers/hid/hid-topseed.c

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
 *

 *  Modified to also support BTC "Emprex 3009URF III Vista MCE Remote" by

 *  Wayne Thomas 2010.

 *

 *  Modified to support Conceptronic CLLRCMCE by

 *  Kees Bakker 2010.

 */



/*
@@ -34,6 +37,7 @@ static int ts_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
	case 0x00d: ts_map_key_clear(KEY_MEDIA);	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;

	case 0x031: ts_map_key_clear(KEY_AUDIO);	break;

	case 0x032: ts_map_key_clear(KEY_TEXT);		break;

	case 0x033: ts_map_key_clear(KEY_CHANNEL);	break;
@@ -60,6 +64,7 @@ static int ts_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
static const struct hid_device_id ts_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },

	{ }

};

MODULE_DEVICE_TABLE(hid, ts_devices);

drivers/hid/hid-wacom.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ static void wacom_remove(struct hid_device *hdev) 


static const struct hid_device_id wacom_devices[] = {

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },



	{ }

};

MODULE_DEVICE_TABLE(hid, wacom_devices);