Merge "ODROID: Add multitouch V/PIDs." into odroidn2-4.9.y-android

2026-06-08 03:40:35 +09:00 · 2019-01-07 14:12:44 +09:00
parent 6a7df3c4c1 370c3dc414
commit 053df08e32
2 changed files with 135 additions and 0 deletions
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -333,6 +333,8 @@
 #define USB_VENDOR_ID_DWAV		0x0eef
 #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER	0x0001
 #define USB_DEVICE_ID_DWAV_TOUCHCONTROLLER	0x0002
+#define USB_DEVICE_ID_DWAV_MULTITOUCH	0x0005
+
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D	0x480d
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E	0x480e
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207	0x7207
@@ -351,6 +353,9 @@
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349	0x7349
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_73F7	0x73f7
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001	0xa001
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224      0x7224
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0      0x72d0
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4      0x72c4

 #define USB_VENDOR_ID_ELAN		0x04f3

@@ -548,6 +553,7 @@

 #define USB_VENDOR_ID_IRTOUCHSYSTEMS	0x6615
 #define USB_DEVICE_ID_IRTOUCH_INFRARED_USB	0x0070
+#define USB_DEVICE_ID_IRTOUCH_TOUCH	0x0001

 #define USB_VENDOR_ID_INNOMEDIA			0x1292
 #define USB_DEVICE_ID_INNEX_GENESIS_ATARI	0x4745
@@ -1114,6 +1120,12 @@
 #define USB_DEVICE_ID_PRIMAX_MOUSE_4D22	0x4d22
 #define USB_DEVICE_ID_PRIMAX_KEYBOARD	0x4e05

+#define USB_VENDOR_ID_SIS	0x0457
+#define USB_DEVICE_ID_SIS_TS	0x1013
+
+/* Elitegroup Computer Systems */
+#define USB_VENDOR_ID_ELITEGROUP    0x03fc
+#define USB_DEVICE_ID_ELITEGROUP_TOUCH  0x05d8

 #define USB_VENDOR_ID_RISO_KAGAKU	0x1294	/* Riso Kagaku Corp. */
 #define USB_DEVICE_ID_RI_KA_WEBMAIL	0x1320	/* Webmail Notifier */
@@ -1128,4 +1140,43 @@
 #define USB_VENDOR_ID_UGTIZER			0x2179
 #define USB_DEVICE_ID_UGTIZER_TABLET_GP0610	0x0053

+/* Nexio Co., Ltd */
+#define USB_VENDOR_ID_NEXIO     0x1870
+#define USB_DEVICE_ID_NEXIO_42TOUCH     0x0100
+#define USB_DEVICE_ID_NEXIO_TOUCH       0x0119
+
+/* Focaltech System FT5926 Multitouch(Hardkernel 9" Touch Screen) */
+#define USB_VENDOR_ID_FOCALTECH 0x2808
+#define USB_DEVICE_ID_FOCALTECH_TOUCH   0x81C9
 #endif
+
+/* Silicon Integrated Systems Corp */
+#define USB_VENDOR_ID_SILICON     0x0457
+#define USB_DEVICE_ID_SILICON_TOUCH     0x1057
+
+/* Chalkboard Electronics 10" HDMI/USB Multitouch Screen */
+#define USB_VENDOR_ID_ELECTRONICS 0x04D8
+#define USB_DEVICE_ID_CHALKBOARD_10_TOUCH 0xF724
+
+/* Acer UT220HQL tbmjz HDMI/USB Multitouch Screen */
+#define USB_VENDOR_ID_ACER 0x25AA
+#define USB_DEVICE_ID_UT220HQL_TOUCH 0x8882
+
+/* eGalax Capacitive Multi-touch Screen */
+#define USB_VENDOR_ID_EGALAX 0x0EEF
+/* Xenarc 700CSH */
+#define USB_DEVICE_ID_700CSH_TOUCH 0x7200
+/* D_WAV Scientific Co.,Ltd  */
+#define USB_DEVICE_ID_AT070TN90_TOUCH 0x0001
+/* Chalkboard Electronics 14" */
+#define USB_DEVICE_ID_CHALKBOARD_14_TOUCH 0xA107
+/* IEI EGLAX 21" */
+#define USB_DEVICE_ID_IEI_EGLAX_21_TOUCH 0x7382
+
+/* SINGWAY XWC1359 7'' USB capacitive Screen */
+#define USB_VENDOR_ID_SINGWAY 0x266E
+#define USB_DEVICE_ID_XWC1359_7_TOUCH 0x0101
+
+/* Dell P2314T USB capacitive Screen */
+#define USB_VENDOR_ID_DELL_P2314T	0x2149
+#define USB_DEVICE_ID_P2314T_TOUCH	0x2316
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1305,6 +1305,9 @@ static const struct hid_device_id mt_devices[] = {
 	{ .driver_data = MT_CLS_EGALAX,
 		MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
 			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
+	{ .driver_data = MT_CLS_EGALAX_SERIAL,
+		MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262) },
 	{ .driver_data = MT_CLS_EGALAX,
 		MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
 			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
@@ -1332,6 +1335,15 @@ static const struct hid_device_id mt_devices[] = {
 	{ .driver_data = MT_CLS_EGALAX_SERIAL,
 		MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
 			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
+	{ .driver_data = MT_CLS_EGALAX,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
+	{ .driver_data = MT_CLS_EGALAX,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0) },
+	{ .driver_data = MT_CLS_EGALAX,
+		HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4) },

 	/* Elitegroup panel */
 	{ .driver_data = MT_CLS_SERIAL,
@@ -1391,6 +1403,27 @@ static const struct hid_device_id mt_devices[] = {
 		MT_USB_DEVICE(USB_VENDOR_ID_ILITEK,
 			USB_DEVICE_ID_ILITEK_MULTITOUCH) },

+	/* IRTOUCH panels */
+	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
+		MT_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
+			USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
+	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
+		HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
+			USB_DEVICE_ID_IRTOUCH_TOUCH) },
+
+	/* LG Display panels */
+	{ .driver_data = MT_CLS_DEFAULT,
+		MT_USB_DEVICE(USB_VENDOR_ID_LG,
+			USB_DEVICE_ID_LG_MULTITOUCH) },
+
+	/* Lumio panels */
+	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
+		MT_USB_DEVICE(USB_VENDOR_ID_LUMIO,
+			USB_DEVICE_ID_CRYSTALTOUCH) },
+	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
+		MT_USB_DEVICE(USB_VENDOR_ID_LUMIO,
+			USB_DEVICE_ID_CRYSTALTOUCH_DUAL) },
+
 	/* MosArt panels */
 	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
 		MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
@@ -1508,6 +1541,57 @@ static const struct hid_device_id mt_devices[] = {
 		MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
 			USB_DEVICE_ID_XIROKU_CSR2) },

+	/* Zytronic panels */
+	{ .driver_data = MT_CLS_SERIAL,
+		MT_USB_DEVICE(USB_VENDOR_ID_ZYTRONIC,
+			USB_DEVICE_ID_ZYTRONIC_ZXY100) },
+
+	 /* Silicon Integrated Systems Corp */
+	{ .driver_data = MT_CLS_DEFAULT,
+		HID_USB_DEVICE(USB_VENDOR_ID_SILICON,
+				USB_DEVICE_ID_SILICON_TOUCH) },
+
+	 /* Chalkboard Electronics 10" HDMI/USB Multitouch Screen */
+	{ .driver_data = MT_CLS_DEFAULT,
+		HID_USB_DEVICE(USB_VENDOR_ID_ELECTRONICS,
+				USB_DEVICE_ID_CHALKBOARD_10_TOUCH) },
+
+	 /* Acer UT220HQL tbmjz HDMI/USB Multitouch Screen */
+	{ .driver_data = MT_CLS_DEFAULT,
+		HID_USB_DEVICE(USB_VENDOR_ID_ACER,
+				USB_DEVICE_ID_UT220HQL_TOUCH) },
+
+	 /* eGalax Capacitive Multi-touch Screen */
+	 /* Xenarc 700CSH */
+	{ .driver_data = MT_CLS_DEFAULT,
+		HID_USB_DEVICE(USB_VENDOR_ID_EGALAX,
+				USB_DEVICE_ID_700CSH_TOUCH) },
+
+	 /* Chalkboard Electronics 14" */
+	{ .driver_data = MT_CLS_DEFAULT,
+		HID_USB_DEVICE(USB_VENDOR_ID_EGALAX,
+				USB_DEVICE_ID_AT070TN90_TOUCH) },
+
+	 /* D_WAV Scientific Co.,Ltd  */
+	{ .driver_data = MT_CLS_DEFAULT,
+		HID_USB_DEVICE(USB_VENDOR_ID_EGALAX,
+				USB_DEVICE_ID_CHALKBOARD_14_TOUCH) },
+
+	 /* IEI EGLAX 21" */
+	{ .driver_data = MT_CLS_DEFAULT,
+		HID_USB_DEVICE(USB_VENDOR_ID_EGALAX,
+				USB_DEVICE_ID_IEI_EGLAX_21_TOUCH) },
+
+	 /* SINGWAY XWC1359 7'' USB capacitive Screen */
+	{ .driver_data = MT_CLS_DEFAULT,
+		HID_USB_DEVICE(USB_VENDOR_ID_SINGWAY,
+				USB_DEVICE_ID_XWC1359_7_TOUCH) },
+
+	 /* Dell P2314T USB capacitive Screen */
+	{ .driver_data = MT_CLS_DEFAULT,
+		HID_USB_DEVICE(USB_VENDOR_ID_DELL_P2314T,
+				USB_DEVICE_ID_P2314T_TOUCH) },
+
 	/* Generic MT device */
 	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) },