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

Commit 604250dd authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus 

Conflicts:
	drivers/hid/hid-core.c
parents 4f94ff4e 16941309 6e7edabf

drivers/hid/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -388,6 +388,13 @@ config HID_ICADE 
	To compile this driver as a module, choose M here: the

	module will be called hid-icade.



config HID_ITE

	tristate "ITE devices"

	depends on HID

	default !EXPERT

	---help---

	Support for ITE devices not fully compliant with HID standard.



config HID_TWINHAN

	tristate "Twinhan IR remote control"

	depends on HID

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ obj-$(CONFIG_HID_HOLTEK) += hid-holtek-mouse.o 
obj-$(CONFIG_HID_HOLTEK)	+= hid-holtekff.o

obj-$(CONFIG_HID_HYPERV_MOUSE)	+= hid-hyperv.o

obj-$(CONFIG_HID_ICADE)		+= hid-icade.o

obj-$(CONFIG_HID_ITE)		+= hid-ite.o

obj-$(CONFIG_HID_KENSINGTON)	+= hid-kensington.o

obj-$(CONFIG_HID_KEYTOUCH)	+= hid-keytouch.o

obj-$(CONFIG_HID_KYE)		+= hid-kye.o

drivers/hid/hid-core.c

+3 −0
Original line number Diff line number Diff line
@@ -1985,6 +1985,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
#if IS_ENABLED(CONFIG_HID_ICADE)

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) },

#endif

#if IS_ENABLED(CONFIG_HID_ITE)

	{ HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE8595) },

#endif

#if IS_ENABLED(CONFIG_HID_KENSINGTON)

	{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },

#endif

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -565,6 +565,7 @@ 
#define USB_DEVICE_ID_ITE_LENOVO_YOGA   0x8386

#define USB_DEVICE_ID_ITE_LENOVO_YOGA2  0x8350

#define USB_DEVICE_ID_ITE_LENOVO_YOGA900	0x8396

#define USB_DEVICE_ID_ITE8595		0x8595



#define USB_VENDOR_ID_JABRA		0x0b0e

#define USB_DEVICE_ID_JABRA_SPEAK_410	0x0412

drivers/hid/hid-input.c

+9 −0
Original line number Diff line number Diff line
@@ -656,6 +656,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
		case HID_GD_START:	map_key_clear(BTN_START);	break;

		case HID_GD_SELECT:	map_key_clear(BTN_SELECT);	break;



		case HID_GD_RFKILL_BTN:

			/* MS wireless radio ctl extension, also check CA */

			if (field->application == HID_GD_WIRELESS_RADIO_CTLS) {

				map_key_clear(KEY_RFKILL);

				/* We need to simulate the btn release */

				field->flags |= HID_MAIN_ITEM_RELATIVE;

				break;

			}



		default: goto unknown;

		}