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

Commit 4a247a41 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'upstream' into for-linus 

Conflicts:
	drivers/hid/Makefile
parents 77aa8e65 4d5df5d1

drivers/hid/Kconfig

+24 −4
Original line number Diff line number Diff line
@@ -200,11 +200,14 @@ config HID_KEYTOUCH 
		- Keytouch IEC 60945



config HID_KYE

	tristate "Kye/Genius Ergo Mouse" if EXPERT

	tristate "KYE/Genius devices"

	depends on USB_HID

	default !EXPERT

	---help---

	Support for Kye/Genius Ergo Mouse.

	Support for KYE/Genius devices not fully compliant with HID standard:

	- Ergo Mouse

	- EasyPen i405X tablet

	- MousePen i608X tablet

	- EasyPen M610X tablet



config HID_UCLOGIC

	tristate "UC-Logic"
@@ -257,7 +260,9 @@ config HID_LOGITECH_DJ 
	---help---

	Say Y if you want support for Logitech Unifying receivers and devices.

	Unifying receivers are capable of pairing up to 6 Logitech compliant

	devices to the same receiver.

	devices to the same receiver. Without this driver it will be handled by

	generic USB_HID driver and all incomming events will be multiplexed

	into a single mouse and a single keyboard device.



config LOGITECH_FF

	bool "Logitech force feedback support"
@@ -485,6 +490,15 @@ config HID_ROCCAT 
	Say Y here if you have a Roccat mouse or keyboard and want

	support for its special functionalities.



config HID_SAITEK

	tristate "Saitek non-fully HID-compliant devices"

	depends on USB_HID

	---help---

	Support for Saitek devices that are not fully compliant with the

	HID standard.



	Currently only supports the PS1000 controller.



config HID_SAMSUNG

	tristate "Samsung InfraRed remote control or keyboards"

	depends on USB_HID
@@ -549,6 +563,12 @@ config SMARTJOYPLUS_FF 
	Say Y here if you have a SmartJoy PLUS PS2/USB adapter and want to

	enable force feedback support for it.



config HID_TIVO

	tristate "TiVo Slide Bluetooth remote control support"

	depends on (USB_HID || BT_HIDP)

	---help---

	Say Y if you have a TiVo Slide Bluetooth remote control.



config HID_TOPSEED

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

	depends on USB_HID

drivers/hid/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ obj-$(CONFIG_HID_PRIMAX) += hid-primax.o 
obj-$(CONFIG_HID_ROCCAT)	+= hid-roccat.o hid-roccat-common.o \

	hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \

	hid-roccat-koneplus.o hid-roccat-kovaplus.o hid-roccat-pyra.o

obj-$(CONFIG_HID_SAITEK)	+= hid-saitek.o

obj-$(CONFIG_HID_SAMSUNG)	+= hid-samsung.o

obj-$(CONFIG_HID_SMARTJOYPLUS)	+= hid-sjoy.o

obj-$(CONFIG_HID_SONY)		+= hid-sony.o
@@ -74,6 +75,7 @@ obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o 
obj-$(CONFIG_HID_SUNPLUS)	+= hid-sunplus.o

obj-$(CONFIG_HID_GREENASIA)	+= hid-gaff.o

obj-$(CONFIG_HID_THRUSTMASTER)	+= hid-tmff.o

obj-$(CONFIG_HID_TIVO)		+= hid-tivo.o

obj-$(CONFIG_HID_TOPSEED)	+= hid-topseed.o

obj-$(CONFIG_HID_TWINHAN)	+= hid-twinhan.o

obj-$(CONFIG_HID_UCLOGIC)	+= hid-uclogic.o

drivers/hid/hid-chicony.c

+7 −0
Original line number Diff line number Diff line
@@ -45,6 +45,12 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
	case 0xff09: ch_map_key_clear(BTN_9);	break;

	case 0xff0a: ch_map_key_clear(BTN_A);	break;

	case 0xff0b: ch_map_key_clear(BTN_B);	break;

	case 0x00f1: ch_map_key_clear(KEY_WLAN);	break;

	case 0x00f2: ch_map_key_clear(KEY_BRIGHTNESSDOWN);	break;

	case 0x00f3: ch_map_key_clear(KEY_BRIGHTNESSUP);	break;

	case 0x00f4: ch_map_key_clear(KEY_DISPLAY_OFF);	break;

	case 0x00f7: ch_map_key_clear(KEY_CAMERA);	break;

	case 0x00f8: ch_map_key_clear(KEY_PROG1);	break;

	default:

		return 0;

	}
@@ -53,6 +59,7 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 


static const struct hid_device_id ch_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },

	{ }

};

MODULE_DEVICE_TABLE(hid, ch_devices);

drivers/hid/hid-core.c

+19 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 *  Copyright (c) 1999 Andreas Gal

 *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>

 *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc

 *  Copyright (c) 2006-2010 Jiri Kosina

 *  Copyright (c) 2006-2012 Jiri Kosina

 */



/*
@@ -50,6 +50,10 @@ module_param_named(debug, hid_debug, int, 0600); 
MODULE_PARM_DESC(debug, "toggle HID debugging messages");

EXPORT_SYMBOL_GPL(hid_debug);



static int hid_ignore_special_drivers = 0;

module_param_named(ignore_special_drivers, hid_ignore_special_drivers, int, 0600);

MODULE_PARM_DESC(debug, "Ignore any special drivers and handle all devices by generic driver");



/*

 * Register a new report for a device.

 */
@@ -1395,6 +1399,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT, USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CVTOUCH, USB_DEVICE_ID_CVTOUCH_SCREEN) },
@@ -1418,6 +1423,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_FRUCTEL, USB_DEVICE_ID_GAMETEL_MT_MODE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) },
@@ -1436,6 +1442,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_I405X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LG, USB_DEVICE_ID_LG_MULTITOUCH) },
@@ -1463,8 +1472,10 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G27_WHEEL) },

#if IS_ENABLED(CONFIG_HID_LOGITECH_DJ)

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER_2) },

#endif

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WII_WHEEL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER) },
@@ -1519,6 +1530,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRELESS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
@@ -1538,6 +1550,8 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },

	{ 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_TOUCH_INTL, USB_DEVICE_ID_TOUCH_INTL_MULTI_TOUCH) },
@@ -1551,6 +1565,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0709) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO) },
@@ -1559,6 +1574,8 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_Q_PAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_PID_0038) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_XAT, USB_DEVICE_ID_XAT_CSR) },
@@ -1674,7 +1691,7 @@ static int hid_bus_match(struct device *dev, struct device_driver *drv) 
		return 0;



	/* generic wants all that don't have specialized driver */

	if (!strncmp(hdrv->name, "generic-", 8))

	if (!strncmp(hdrv->name, "generic-", 8) && !hid_ignore_special_drivers)

		return !hid_match_id(hdev, hid_have_special_driver);



	return 1;

drivers/hid/hid-ids.h

+16 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ 
#define USB_VENDOR_ID_CH		0x068e

#define USB_DEVICE_ID_CH_PRO_THROTTLE	0x00f1

#define USB_DEVICE_ID_CH_PRO_PEDALS	0x00f2

#define USB_DEVICE_ID_CH_FIGHTERSTICK	0x00f3

#define USB_DEVICE_ID_CH_COMBATSTICK	0x00f4

#define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE       0x0051

#define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE	0x00ff
@@ -194,6 +195,7 @@ 
#define USB_DEVICE_ID_CHICONY_TACTICAL_PAD	0x0418

#define USB_DEVICE_ID_CHICONY_MULTI_TOUCH	0xb19d

#define USB_DEVICE_ID_CHICONY_WIRELESS	0x0618

#define USB_DEVICE_ID_CHICONY_WIRELESS2	0x1123



#define USB_VENDOR_ID_CHUNGHWAT		0x2247

#define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH	0x0001
@@ -280,6 +282,9 @@ 
#define USB_VENDOR_ID_EZKEY		0x0518

#define USB_DEVICE_ID_BTC_8193		0x0002



#define USB_VENDOR_ID_FRUCTEL	0x25B6

#define USB_DEVICE_ID_GAMETEL_MT_MODE	0x0002



#define USB_VENDOR_ID_GAMERON		0x0810

#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR	0x0001

#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR	0x0002
@@ -417,6 +422,9 @@ 
#define USB_VENDOR_ID_KYE		0x0458

#define USB_DEVICE_ID_KYE_ERGO_525V	0x0087

#define USB_DEVICE_ID_KYE_GPEN_560	0x5003

#define USB_DEVICE_ID_KYE_EASYPEN_I405X	0x5010

#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X	0x5011

#define USB_DEVICE_ID_KYE_EASYPEN_M610X	0x5013



#define USB_VENDOR_ID_LABTEC		0x1020

#define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD	0x0006
@@ -629,6 +637,7 @@ 


#define USB_VENDOR_ID_SAITEK		0x06a3

#define USB_DEVICE_ID_SAITEK_RUMBLEPAD	0xff17

#define USB_DEVICE_ID_SAITEK_PS1000	0x0621



#define USB_VENDOR_ID_SAMSUNG		0x0419

#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001
@@ -670,6 +679,10 @@ 


#define USB_VENDOR_ID_THRUSTMASTER	0x044f



#define USB_VENDOR_ID_TIVO		0x150a

#define USB_DEVICE_ID_TIVO_SLIDE_BT	0x1200

#define USB_DEVICE_ID_TIVO_SLIDE	0x1201



#define USB_VENDOR_ID_TOPSEED		0x0766

#define USB_DEVICE_ID_TOPSEED_CYBERLINK	0x0204
@@ -720,6 +733,8 @@ 
#define USB_VENDOR_ID_WALTOP				0x172f

#define USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH	0x0032

#define USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH	0x0034

#define USB_DEVICE_ID_WALTOP_Q_PAD			0x0037

#define USB_DEVICE_ID_WALTOP_PID_0038			0x0038

#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH	0x0501

#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH	0x0500
@@ -728,6 +743,7 @@ 
#define USB_DEVICE_ID_1_PHIDGETSERVO_20	0x8101

#define USB_DEVICE_ID_4_PHIDGETSERVO_20	0x8104

#define USB_DEVICE_ID_8_8_4_IF_KIT	0x8201

#define USB_DEVICE_ID_SUPER_JOY_BOX_3	0x8888

#define USB_DEVICE_ID_QUAD_USB_JOYPAD	0x8800

#define USB_DEVICE_ID_DUAL_USB_JOYPAD	0x8866