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

Commit 7f474df0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

Pull HID fixes from Jiri Kosina:
 - workarounds for a couple of misbehaving Elan Touchscreens, by Adel
   Gadllah
 - fix for TransducerSerialNumber field implementation, by Jason Gerecke
 - a couple of new HID usages (added by HUT), by Olivier Gay

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: input: Fix TransducerSerialNumber implementation
  HID: add keyboard input assist hid usages
  HID: usbhid: enable always-poll quirk for Elan Touchscreen 016f
  HID: usbhid: enable always-poll quirk for Elan Touchscreen 009b
parents 8c782932 5989a55a

drivers/hid/hid-debug.c

+6 −0
Original line number Diff line number Diff line
@@ -946,6 +946,12 @@ static const char *keys[KEY_MAX + 1] = { 
	[KEY_BRIGHTNESS_MIN] = "BrightnessMin",

	[KEY_BRIGHTNESS_MAX] = "BrightnessMax",

	[KEY_BRIGHTNESS_AUTO] = "BrightnessAuto",

	[KEY_KBDINPUTASSIST_PREV] = "KbdInputAssistPrev",

	[KEY_KBDINPUTASSIST_NEXT] = "KbdInputAssistNext",

	[KEY_KBDINPUTASSIST_PREVGROUP] = "KbdInputAssistPrevGroup",

	[KEY_KBDINPUTASSIST_NEXTGROUP] = "KbdInputAssistNextGroup",

	[KEY_KBDINPUTASSIST_ACCEPT] = "KbdInputAssistAccept",

	[KEY_KBDINPUTASSIST_CANCEL] = "KbdInputAssistCancel",

};



static const char *relatives[REL_MAX + 1] = {

drivers/hid/hid-ids.h

+2 −0
Original line number Diff line number Diff line
@@ -298,6 +298,8 @@ 


#define USB_VENDOR_ID_ELAN		0x04f3

#define USB_DEVICE_ID_ELAN_TOUCHSCREEN	0x0089

#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B	0x009b

#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F	0x016f



#define USB_VENDOR_ID_ELECOM		0x056e

#define USB_DEVICE_ID_ELECOM_BM084	0x0061

drivers/hid/hid-input.c

+11 −1
Original line number Diff line number Diff line
@@ -695,7 +695,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
			break;



		case 0x5b: /* TransducerSerialNumber */

			set_bit(MSC_SERIAL, input->mscbit);

			usage->type = EV_MSC;

			usage->code = MSC_SERIAL;

			bit = input->mscbit;

			max = MSC_MAX;

			break;



		default:  goto unknown;
@@ -862,6 +865,13 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
		case 0x28b: map_key_clear(KEY_FORWARDMAIL);	break;

		case 0x28c: map_key_clear(KEY_SEND);		break;



		case 0x2c7: map_key_clear(KEY_KBDINPUTASSIST_PREV);		break;

		case 0x2c8: map_key_clear(KEY_KBDINPUTASSIST_NEXT);		break;

		case 0x2c9: map_key_clear(KEY_KBDINPUTASSIST_PREVGROUP);		break;

		case 0x2ca: map_key_clear(KEY_KBDINPUTASSIST_NEXTGROUP);		break;

		case 0x2cb: map_key_clear(KEY_KBDINPUTASSIST_ACCEPT);	break;

		case 0x2cc: map_key_clear(KEY_KBDINPUTASSIST_CANCEL);	break;



		default:    goto ignore;

		}

		break;

drivers/hid/usbhid/hid-quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },

include/uapi/linux/input.h

+7 −0
Original line number Diff line number Diff line
@@ -739,6 +739,13 @@ struct input_keymap_entry { 
#define KEY_BRIGHTNESS_MIN		0x250	/* Set Brightness to Minimum */

#define KEY_BRIGHTNESS_MAX		0x251	/* Set Brightness to Maximum */



#define KEY_KBDINPUTASSIST_PREV		0x260

#define KEY_KBDINPUTASSIST_NEXT		0x261

#define KEY_KBDINPUTASSIST_PREVGROUP		0x262

#define KEY_KBDINPUTASSIST_NEXTGROUP		0x263

#define KEY_KBDINPUTASSIST_ACCEPT		0x264

#define KEY_KBDINPUTASSIST_CANCEL		0x265



#define BTN_TRIGGER_HAPPY		0x2c0

#define BTN_TRIGGER_HAPPY1		0x2c0

#define BTN_TRIGGER_HAPPY2		0x2c1