summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-core.c11
-rw-r--r--drivers/hid/hid-ids.h13
-rw-r--r--drivers/hid/hid-multitouch.c19
3 files changed, 43 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 4da66b4b..b003c82e 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1595,6 +1595,17 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },
+ //Add by ZeroChip Kevin for FuRuiYing Add fitouch USB touch screen 2014.12.07 Start
+ //Fitouch
+ {HID_USB_DEVICE(USB_VENDOR_ID_FITOUCH, USB_DEVICE_ID_FITOUCH_TOUCHSCREEN_SG) },
+ {HID_USB_DEVICE(USB_VENDOR_ID_FITOUCH, USB_DEVICE_ID_FITOUCH_TOUCHSCREEN_MT) },
+ {HID_USB_DEVICE(USB_VENDOR_ID_FITOUCH, USB_DEVICE_ID_FITOUCH_TOUCHSCREEN_Z_MT) },
+ //Add by ZeroChip Kevin for FuRuiYing Add fitouch USB touch screen 2014.12.07 End
+
+ //Add by ZeroChip Kevin for FuRuiYing Add FRY01 USB touch screen 2014.12.07 Start
+ //FRY01
+ {HID_USB_DEVICE(USB_VENDOR_ID_FRY, USB_DEVICE_ID_FRY_TOUCHSCREEN_01) },
+ //Add by ZeroChip Kevin for FuRuiYing Add FRY01 USB touch screen 2014.12.07 End
{ }
};
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index e39aecb1..88e6abbe 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -794,4 +794,17 @@
#define USB_VENDOR_ID_PRIMAX 0x0461
#define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05
+//Add by ZeroChip Kevin for FuRuiYing Add fitouch USB touch screen 2014.12.07 Start
+#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
+//Add by ZeroChip Kevin for FuRuiYing Add fitouch USB touch screen 2014.12.07 End
+
+//Add by ZeroChip Kevin for FuRuiYing Add FRY01 USB touch screen 2014.12.07 Start
+#define USB_VENDOR_ID_FRY 0x1818
+#define USB_DEVICE_ID_FRY_TOUCHSCREEN_01 0x0015
+//Add by ZeroChip Kevin for FuRuiYing Add FRY01 USB touch screen 2014.12.07 End
+
+
#endif
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 8cf4310a..3c4109c4 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1043,6 +1043,25 @@ static const struct hid_device_id mt_devices[] = {
HID_USB_DEVICE(USB_VENDOR_ID_XIROKU,
USB_DEVICE_ID_XIROKU_CSR2) },
+//Add by ZeroChip Kevin for FuRuiYing Add fitouch USB touch screen 2014.12.07 Start
+//Fitouch
+ { .driver_data = MT_CLS_DEFAULT,
+ HID_USB_DEVICE(USB_VENDOR_ID_FITOUCH,
+ USB_DEVICE_ID_FITOUCH_TOUCHSCREEN_SG) },
+ { .driver_data = MT_CLS_DEFAULT,
+ HID_USB_DEVICE(USB_VENDOR_ID_FITOUCH,
+ USB_DEVICE_ID_FITOUCH_TOUCHSCREEN_MT) },
+ { .driver_data = MT_CLS_DEFAULT,
+ HID_USB_DEVICE(USB_VENDOR_ID_FITOUCH,
+ USB_DEVICE_ID_FITOUCH_TOUCHSCREEN_Z_MT) },
+//Add by ZeroChip Kevin for FuRuiYing Add fitouch USB touch screen 2014.12.07 End
+//Add by ZeroChip Kevin for FuRuiYing Add FRY01 USB touch screen 2014.12.07 Start
+//FRY01
+ { .driver_data = MT_CLS_DEFAULT,
+ HID_USB_DEVICE(USB_VENDOR_ID_FRY,
+ USB_DEVICE_ID_FRY_TOUCHSCREEN_01) },
+//Add by ZeroChip Kevin for FuRuiYing Add FRY01 USB touch screen 2014.12.07 End
+
{ }
};
MODULE_DEVICE_TABLE(hid, mt_devices);