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

Commit 8866f9df 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 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wacom: Add BTN_TOOL_FINGER for pad button reporting
  HID: add device IDs for new model of Apple Wireless Keyboard
  HID: fix pad button definition in hid-wacom
  HID: Support 171 byte variant of Samsung USB IR receiver
  HID: blacklist ET&T TC5UH touchscreen controller
parents 04e9e5c7 0e253fdb

drivers/hid/hid-apple.c

+7 −0
Original line number Diff line number Diff line
@@ -431,6 +431,13 @@ static const struct hid_device_id apple_devices[] = { 
		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_ISO_KEYBOARD },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),

drivers/hid/hid-core.c

+4 −0
Original line number Diff line number Diff line
@@ -1285,6 +1285,9 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
@@ -1553,6 +1556,7 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) },

drivers/hid/hid-ids.h

+6 −0
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ 
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI	0x0236

#define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO	0x0237

#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS	0x0238

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b

#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a

#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b

#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL	0x8241
@@ -166,6 +169,9 @@ 
#define USB_VENDOR_ID_ESSENTIAL_REALITY	0x0d7f

#define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100



#define USB_VENDOR_ID_ETT		0x0664

#define USB_DEVICE_ID_TC5UH		0x0309



#define USB_VENDOR_ID_EZKEY 		0x0518

#define USB_DEVICE_ID_BTC_8193		0x0002

drivers/hid/hid-samsung.c

+19 −6
Original line number Diff line number Diff line
@@ -39,7 +39,17 @@ 
 *

 * 3. 135 byte report descriptor

 * Report #4 has an array field with logical range 0..17 instead of 1..14.

 *

 * 4. 171 byte report descriptor

 * Report #3 has an array field with logical range 0..1 instead of 1..3.

 */

static inline void samsung_dev_trace(struct hid_device *hdev,

		unsigned int rsize)

{

	dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "

			"descriptor\n", rsize);

}



static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int rsize)

{
@@ -47,8 +57,7 @@ static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
			rdesc[177] == 0x75 && rdesc[178] == 0x30 &&

			rdesc[179] == 0x95 && rdesc[180] == 0x01 &&

			rdesc[182] == 0x40) {

		dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "

				"descriptor\n", 184);

		samsung_dev_trace(hdev, 184);

		rdesc[176] = 0xff;

		rdesc[178] = 0x08;

		rdesc[180] = 0x06;
@@ -56,17 +65,21 @@ static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
	} else

	if (rsize == 203 && rdesc[192] == 0x15 && rdesc[193] == 0x0 &&

			rdesc[194] == 0x25 && rdesc[195] == 0x12) {

		dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "

				"descriptor\n", 203);

		samsung_dev_trace(hdev, 203);

		rdesc[193] = 0x1;

		rdesc[195] = 0xf;

	} else

	if (rsize == 135 && rdesc[124] == 0x15 && rdesc[125] == 0x0 &&

			rdesc[126] == 0x25 && rdesc[127] == 0x11) {

		dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "

				"descriptor\n", 135);

		samsung_dev_trace(hdev, 135);

		rdesc[125] = 0x1;

		rdesc[127] = 0xe;

	} else

	if (rsize == 171 && rdesc[160] == 0x15 && rdesc[161] == 0x0 &&

			rdesc[162] == 0x25 && rdesc[163] == 0x01) {

		samsung_dev_trace(hdev, 171);

		rdesc[161] = 0x1;

		rdesc[163] = 0x3;

	}

}

drivers/hid/hid-wacom.c

+4 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report, 
		wdata->butstate = rw;

		input_report_key(input, BTN_0, rw & 0x02);

		input_report_key(input, BTN_1, rw & 0x01);

		input_report_key(input, BTN_TOOL_FINGER, 0xf0);

		input_event(input, EV_MSC, MSC_SERIAL, 0xf0);

		input_sync(input);

	}
@@ -196,6 +197,9 @@ static int wacom_probe(struct hid_device *hdev, 
	/* Pad */

	input->evbit[0] |= BIT(EV_MSC);

	input->mscbit[0] |= BIT(MSC_SERIAL);

	set_bit(BTN_0, input->keybit);

	set_bit(BTN_1, input->keybit);

	set_bit(BTN_TOOL_FINGER, input->keybit);



	/* Distance, rubber and mouse */

	input->absbit[0] |= BIT(ABS_DISTANCE);