shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chris Kim
2019-01-07 14:12:53 +09:00
committed by Gerrit Code Review
parent 053df08e32 632637aab4
commit 2739951aae
3 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hid/hid-core.c
View File

@@ -2505,6 +2505,8 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_MULTITOUCH) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) },
{ }
};

34
drivers/hid/hid-ids.h
View File

@@ -1148,7 +1148,6 @@
/* 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
@@ -1180,3 +1179,36 @@
/* Dell P2314T USB capacitive Screen */
#define USB_VENDOR_ID_DELL_P2314T 0x2149
#define USB_DEVICE_ID_P2314T_TOUCH 0x2316
/* DMeasyTouch USB capacitive Screen */
#define USB_VENDOR_ID_DMEASY 0x7374
#define USB_DEVICE_ID_DMEASY_TOUCH 0x1241
/* ELO 1002L USB capacitive Screen */
#define USB_VENDOR_ID_ELO_1002L 0x05E3
#define USB_DEVICE_ID_ELO_1002L_TOUCH 0x0608
/* LG 23ET63V USB capacitive Screen */
#define USB_VENDOR_ID_LG_23ET63V 0x0457
#define USB_DEVICE_ID_LG_23ET63V_TOUCH 0x1034
/* Lilliput 779GL-70NP/C/T - 7" HDMI capacitive Screen */
#define USB_VENDOR_ID_LILLIPUT 0x1391
#define USB_DEVICE_ID_LILLIPUT_779GL_TOUCH 0x2112
/* Zaagtech HDMI capacitive Screen */
#define USB_VENDOR_ID_ZAAGTECH 0xAAEC
#define USB_DEVICE_ID_ZAAGTECH_TOUCH 0xC021
/* FITOUCH */
#define USB_VENDOR_ID_FITOUCH 0x10c4
#define USB_DEVICE_ID_FITOUCH_TOUCHSCREEN_SG 0x5e50
#define USB_DEVICE_ID_FITOUCH_TOUCHSCREEN_MT 0x5e51
#define USB_DEVICE_ID_FITOUCH_TOUCHSCREEN_Z_MT 0x5e52
/* Hardkernel */
#define USB_VENDOR_ID_ODROID 0x16b4
#define USB_DEVICE_ID_VU5 0x0704
#define USB_DEVICE_ID_VU7PLUS 0x0705
#endif

40
drivers/hid/hid-multitouch.c
View File

@@ -1592,6 +1592,46 @@ static const struct hid_device_id mt_devices[] = {
HID_USB_DEVICE(USB_VENDOR_ID_DELL_P2314T,
USB_DEVICE_ID_P2314T_TOUCH) },
/* DMeasyTouch USB capacitive Screen */
{ .driver_data = MT_CLS_DEFAULT,
HID_USB_DEVICE(USB_VENDOR_ID_DMEASY,
USB_DEVICE_ID_DMEASY_TOUCH) },
/* ELO USB capacitive Screen */
{ .driver_data = MT_CLS_DEFAULT,
HID_USB_DEVICE(USB_VENDOR_ID_ELO_1002L,
USB_DEVICE_ID_ELO_1002L_TOUCH) },
/* LG 23ET63V USB capacitive Screen */
{ .driver_data = MT_CLS_DEFAULT,
HID_USB_DEVICE(USB_VENDOR_ID_LG_23ET63V,
USB_DEVICE_ID_LG_23ET63V_TOUCH) },
/* Lilliput 779GL-70NP/C/T - 7" HDMI capacitive Screen */
{ .driver_data = MT_CLS_DEFAULT,
HID_USB_DEVICE(USB_VENDOR_ID_LILLIPUT,
USB_DEVICE_ID_LILLIPUT_779GL_TOUCH) },
/* Zaagtech HDMI capacitive Screen */
{ .driver_data = MT_CLS_DEFAULT,
HID_USB_DEVICE(USB_VENDOR_ID_ZAAGTECH,
USB_DEVICE_ID_ZAAGTECH_TOUCH) },
/* FITOUCH HDMI capacitive Screen */
{ .driver_data = MT_CLS_DEFAULT,
HID_USB_DEVICE(USB_VENDOR_ID_FITOUCH,
USB_DEVICE_ID_FITOUCH_TOUCHSCREEN_SG) },
/* FITOUCH HDMI capacitive Screen */
{ .driver_data = MT_CLS_DEFAULT,
HID_USB_DEVICE(USB_VENDOR_ID_FITOUCH,
USB_DEVICE_ID_FITOUCH_TOUCHSCREEN_MT) },
/* FITOUCH HDMI capacitive Screen */
{ .driver_data = MT_CLS_DEFAULT,
HID_USB_DEVICE(USB_VENDOR_ID_FITOUCH,
USB_DEVICE_ID_FITOUCH_TOUCHSCREEN_Z_MT) },
/* Generic MT device */
{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) },