Merge branch 'for-3.15/microsoft' into for-linus (6cf8c85f) · Commits · e / devices / android_kernel_samsung_universal8890

drivers/hid/hid-core.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1823,6 +1823,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },

drivers/hid/hid-ids.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -615,6 +615,7 @@

		#define USB_VENDOR_ID_MICROSOFT 0x045e
		#define USB_DEVICE_ID_SIDEWINDER_GV 0x003b
		#define USB_DEVICE_ID_MS_OFFICE_KB 0x0048
		#define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d
		#define USB_DEVICE_ID_MS_NE4K 0x00db
		#define USB_DEVICE_ID_MS_NE4K_JP 0x00dc

drivers/hid/hid-input.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -789,10 +789,13 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
		case 0x199: map_key_clear(KEY_CHAT); break;
		case 0x19c: map_key_clear(KEY_LOGOFF); break;
		case 0x19e: map_key_clear(KEY_COFFEE); break;
		case 0x1a3: map_key_clear(KEY_NEXT); break;
		case 0x1a4: map_key_clear(KEY_PREVIOUS); break;
		case 0x1a6: map_key_clear(KEY_HELP); break;
		case 0x1a7: map_key_clear(KEY_DOCUMENTS); break;
		case 0x1ab: map_key_clear(KEY_SPELLCHECK); break;
		case 0x1ae: map_key_clear(KEY_KEYBOARD); break;
		case 0x1b4: map_key_clear(KEY_FILE); break;
		case 0x1b6: map_key_clear(KEY_IMAGES); break;
		case 0x1b7: map_key_clear(KEY_AUDIO); break;
		case 0x1b8: map_key_clear(KEY_VIDEO); break;

drivers/hid/hid-microsoft.c

+70 −4

Original line number	Diff line number	Diff line
		@@ -62,9 +62,48 @@ static int ms_ergonomy_kb_quirk(struct hid_input hi, struct hid_usage usage,
		{
		struct input_dev *input = hi->input;

		if ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER) {
		switch (usage->hid & HID_USAGE) {
		/*
		* Microsoft uses these 2 reserved usage ids for 2 keys on
		* the MS office kb labelled "Office Home" and "Task Pane".
		*/
		case 0x29d:
		ms_map_key_clear(KEY_PROG1);
		return 1;
		case 0x29e:
		ms_map_key_clear(KEY_PROG2);
		return 1;
		}
		return 0;
		}

		if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
		return 0;

		switch (usage->hid & HID_USAGE) {
		case 0xfd06: ms_map_key_clear(KEY_CHAT); break;
		case 0xfd07: ms_map_key_clear(KEY_PHONE); break;
		case 0xff00:
		/* Special keypad keys */
		ms_map_key_clear(KEY_KPEQUAL);
		set_bit(KEY_KPLEFTPAREN, input->keybit);
		set_bit(KEY_KPRIGHTPAREN, input->keybit);
		break;
		case 0xff01:
		/* Scroll wheel */
		hid_map_usage_clear(hi, usage, bit, max, EV_REL, REL_WHEEL);
		break;
		case 0xff02:
		/*
		* This byte contains a copy of the modifier keys byte of a
		* standard hid keyboard report, as send by interface 0
		* (this usage is found on interface 1).
		*
		* This byte only gets send when another key in the same report
		* changes state, and as such is useless, ignore it.
		*/
		return -1;
		case 0xff05:
		set_bit(EV_REP, input->evbit);
		ms_map_key_clear(KEY_F13);
		@@ -83,6 +122,9 @@ static int ms_ergonomy_kb_quirk(struct hid_input hi, struct hid_usage usage,
		static int ms_presenter_8k_quirk(struct hid_input hi, struct hid_usage usage,
		unsigned long *bit, int max)
		{
		if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
		return 0;

		set_bit(EV_REP, hi->input->evbit);
		switch (usage->hid & HID_USAGE) {
		case 0xfd08: ms_map_key_clear(KEY_FORWARD); break;
		@@ -102,9 +144,6 @@ static int ms_input_mapping(struct hid_device hdev, struct hid_input hi,
		{
		unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);

		if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
		return 0;

		if (quirks & MS_ERGONOMY) {
		int ret = ms_ergonomy_kb_quirk(hi, usage, bit, max);
		if (ret)
		@@ -134,14 +173,39 @@ static int ms_event(struct hid_device hdev, struct hid_field field,
		struct hid_usage *usage, __s32 value)
		{
		unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
		struct input_dev *input;

		if (!(hdev->claimed & HID_CLAIMED_INPUT) \|\| !field->hidinput \|\|
		!usage->type)
		return 0;

		input = field->hidinput->input;

		/* Handling MS keyboards special buttons */
		if (quirks & MS_ERGONOMY && usage->hid == (HID_UP_MSVENDOR \| 0xff00)) {
		/* Special keypad keys */
		input_report_key(input, KEY_KPEQUAL, value & 0x01);
		input_report_key(input, KEY_KPLEFTPAREN, value & 0x02);
		input_report_key(input, KEY_KPRIGHTPAREN, value & 0x04);
		return 1;
		}

		if (quirks & MS_ERGONOMY && usage->hid == (HID_UP_MSVENDOR \| 0xff01)) {
		/* Scroll wheel */
		int step = ((value & 0x60) >> 5) + 1;

		switch (value & 0x1f) {
		case 0x01:
		input_report_rel(input, REL_WHEEL, step);
		break;
		case 0x1f:
		input_report_rel(input, REL_WHEEL, -step);
		break;
		}
		return 1;
		}

		if (quirks & MS_ERGONOMY && usage->hid == (HID_UP_MSVENDOR \| 0xff05)) {
		struct input_dev *input = field->hidinput->input;
		static unsigned int last_key = 0;
		unsigned int key = 0;
		switch (value) {
		@@ -194,6 +258,8 @@ err_free:
		static const struct hid_device_id ms_devices[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV),
		.driver_data = MS_HIDINPUT },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB),
		.driver_data = MS_ERGONOMY },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K),
		.driver_data = MS_ERGONOMY },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP),