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

Commit c04abeef authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch Plus 



This patch adds support for Elo TouchSystems 2515 IntelliTouch Plus
that can be found in Lenovo A700 all-in-one.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@enac.fr>
Tested-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent df167c4a

drivers/hid/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ config HID_MULTITOUCH 
	  - 3M PCT touch screens

	  - Cando dual touch panel

	  - Cypress TrueTouch panels

	  - Elo TouchSystems IntelliTouch Plus panels

	  - Hanvon dual touch panels

	  - Ilitek dual touch panel

	  - IrTouch Infrared USB panels

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1366,6 +1366,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ 
#define USB_VENDOR_ID_DREAM_CHEEKY	0x1d34



#define USB_VENDOR_ID_ELO		0x04E7

#define USB_DEVICE_ID_ELO_TS2515	0x0022

#define USB_DEVICE_ID_ELO_TS2700	0x0020



#define USB_VENDOR_ID_EMS		0x2006

drivers/hid/hid-multitouch.c

+10 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ struct mt_class { 
#define MT_CLS_3M				7

#define MT_CLS_CONFIDENCE			8

#define MT_CLS_CONFIDENCE_MINUS_ONE		9

#define MT_CLS_DUAL_NSMU_CONTACTID		10



#define MT_DEFAULT_MAXCONTACT	10
@@ -163,6 +164,10 @@ struct mt_class mt_classes[] = { 
		.sn_height = 128 },

	{ .name = MT_CLS_CONFIDENCE,

		.quirks = MT_QUIRK_VALID_IS_CONFIDENCE },

	{ .name = MT_CLS_DUAL_NSMU_CONTACTID,

		.quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |

			MT_QUIRK_SLOT_IS_CONTACTID,

		.maxcontacts = 2 },



	{ }

};
@@ -584,6 +589,11 @@ static const struct hid_device_id mt_devices[] = { 
		HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS,

			USB_DEVICE_ID_CYPRESS_TRUETOUCH) },



	/* Elo TouchSystems IntelliTouch Plus panel */

	{ .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,

		HID_USB_DEVICE(USB_VENDOR_ID_ELO,

			USB_DEVICE_ID_ELO_TS2515) },



	/* GeneralTouch panel */

	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,

		HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,