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

Commit 645832cc authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'multitouch' into device-groups 



I am merging multitouch branch into device-groups so that support
for Baanto device can be adjusted accordingly to the new autoloading
patches.

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parents 2c2110e9 9ed32695

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1497,6 +1497,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ 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) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BAANTO, USB_DEVICE_ID_BAANTO_MT_190W2), },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ 
#define USB_VENDOR_ID_AVERMEDIA		0x07ca

#define USB_DEVICE_ID_AVER_FM_MR800	0xb800



#define USB_VENDOR_ID_BAANTO		0x2453

#define USB_DEVICE_ID_BAANTO_MT_190W2	0x0100



#define USB_VENDOR_ID_BELKIN		0x050d

#define USB_DEVICE_ID_FLIP_KVM		0x3201

drivers/hid/hid-multitouch.c

+4 −0
Original line number Diff line number Diff line
@@ -760,6 +760,10 @@ static const struct hid_device_id mt_devices[] = { 
		MT_USB_DEVICE(USB_VENDOR_ID_ATMEL,

			USB_DEVICE_ID_ATMEL_MXT_DIGITIZER) },



	/* Baanto multitouch devices */

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_BAANTO,

			USB_DEVICE_ID_BAANTO_MT_190W2) },

	/* Cando panels */

	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,

		MT_USB_DEVICE(USB_VENDOR_ID_CANDO,