1 files changed, 42 insertions, 1 deletions

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index ea1c6177f18f..e39aecb1f9f2 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -41,7 +41,7 @@
 #define USB_VENDOR_ID_ACTIONSTAR        0x2101
 #define USB_DEVICE_ID_ACTIONSTAR_1011   0x1011
 
-#define USB_VENDOR_ID_ADS_TECH          0x06e1
+#define USB_VENDOR_ID_ADS_TECH          0x06e1
 #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X     0xa155
 
 #define USB_VENDOR_ID_AFATECH           0x15a4
@@ -152,6 +152,7 @@
 
 #define USB_VENDOR_ID_ATMEL             0x03eb
 #define USB_DEVICE_ID_ATMEL_MULTITOUCH  0x211c
+#define USB_DEVICE_ID_ATMEL_MXT_DIGITIZER       0x2118
 
 #define USB_VENDOR_ID_AVERMEDIA         0x07ca
 #define USB_DEVICE_ID_AVER_FM_MR800     0xb800
@@ -176,6 +177,7 @@
 #define USB_VENDOR_ID_CH                0x068e
 #define USB_DEVICE_ID_CH_PRO_THROTTLE   0x00f1
 #define USB_DEVICE_ID_CH_PRO_PEDALS     0x00f2
+#define USB_DEVICE_ID_CH_FIGHTERSTICK   0x00f3
 #define USB_DEVICE_ID_CH_COMBATSTICK    0x00f4
 #define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE       0x0051
 #define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE        0x00ff
@@ -193,6 +195,7 @@
 #define USB_DEVICE_ID_CHICONY_TACTICAL_PAD      0x0418
 #define USB_DEVICE_ID_CHICONY_MULTI_TOUCH       0xb19d
 #define USB_DEVICE_ID_CHICONY_WIRELESS  0x0618
+#define USB_DEVICE_ID_CHICONY_WIRELESS2 0x1123
 
 #define USB_VENDOR_ID_CHUNGHWAT         0x2247
 #define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH      0x0001
@@ -240,11 +243,18 @@
 #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER    0x0001
 #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
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C       0x720c
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224       0x7224
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A       0x722A
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E       0x725e
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262       0x7262
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B       0x726b
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA       0x72aa
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1       0x72a1
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA       0x72fa
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302       0x7302
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349       0x7349
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001       0xa001
 
 #define USB_VENDOR_ID_ELECOM            0x056e
@@ -272,6 +282,9 @@
 #define USB_VENDOR_ID_EZKEY             0x0518
 #define USB_DEVICE_ID_BTC_8193          0x0002
 
+#define USB_VENDOR_ID_FRUCTEL   0x25B6
+#define USB_DEVICE_ID_GAMETEL_MT_MODE   0x0002
+
 #define USB_VENDOR_ID_GAMERON           0x0810
 #define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR  0x0001
 #define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR  0x0002
@@ -377,6 +390,7 @@
 
 #define USB_VENDOR_ID_IDEACOM           0x1cb6
 #define USB_DEVICE_ID_IDEACOM_IDC6650   0x6650
+#define USB_DEVICE_ID_IDEACOM_IDC6651   0x6651
 
 #define USB_VENDOR_ID_ILITEK            0x222a
 #define USB_DEVICE_ID_ILITEK_MULTITOUCH 0x0001
@@ -408,6 +422,9 @@
 #define USB_VENDOR_ID_KYE               0x0458
 #define USB_DEVICE_ID_KYE_ERGO_525V     0x0087
 #define USB_DEVICE_ID_KYE_GPEN_560      0x5003
+#define USB_DEVICE_ID_KYE_EASYPEN_I405X 0x5010
+#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X        0x5011
+#define USB_DEVICE_ID_KYE_EASYPEN_M610X 0x5013
 
 #define USB_VENDOR_ID_LABTEC            0x1020
 #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD  0x0006
@@ -569,6 +586,10 @@
 #define USB_DEVICE_ID_ORTEK_PKB1700     0x1700
 #define USB_DEVICE_ID_ORTEK_WKB2000     0x2000
 
+#define USB_VENDOR_ID_PANASONIC         0x04da
+#define USB_DEVICE_ID_PANABOARD_UBT780  0x1044
+#define USB_DEVICE_ID_PANABOARD_UBT880  0x104d
+
 #define USB_VENDOR_ID_PANJIT            0x134c
 
 #define USB_VENDOR_ID_PANTHERLORD       0x0810
@@ -617,6 +638,7 @@
 
 #define USB_VENDOR_ID_SAITEK            0x06a3
 #define USB_DEVICE_ID_SAITEK_RUMBLEPAD  0xff17
+#define USB_DEVICE_ID_SAITEK_PS1000     0x0621
 
 #define USB_VENDOR_ID_SAMSUNG           0x0419
 #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
@@ -656,13 +678,29 @@
 #define USB_DEVICE_ID_SYMBOL_SCANNER_1  0x0800
 #define USB_DEVICE_ID_SYMBOL_SCANNER_2  0x1300
 
+#define USB_VENDOR_ID_SYNAPTICS         0x06cb
+#define USB_DEVICE_ID_SYNAPTICS_TP      0x0001
+#define USB_DEVICE_ID_SYNAPTICS_INT_TP  0x0002
+#define USB_DEVICE_ID_SYNAPTICS_CPAD    0x0003
+#define USB_DEVICE_ID_SYNAPTICS_TS      0x0006
+#define USB_DEVICE_ID_SYNAPTICS_STICK   0x0007
+#define USB_DEVICE_ID_SYNAPTICS_WP      0x0008
+#define USB_DEVICE_ID_SYNAPTICS_COMP_TP 0x0009
+#define USB_DEVICE_ID_SYNAPTICS_WTP     0x0010
+#define USB_DEVICE_ID_SYNAPTICS_DPAD    0x0013
+
 #define USB_VENDOR_ID_THRUSTMASTER      0x044f
 
+#define USB_VENDOR_ID_TIVO              0x150a
+#define USB_DEVICE_ID_TIVO_SLIDE_BT     0x1200
+#define USB_DEVICE_ID_TIVO_SLIDE        0x1201
+
 #define USB_VENDOR_ID_TOPSEED           0x0766
 #define USB_DEVICE_ID_TOPSEED_CYBERLINK 0x0204
 
 #define USB_VENDOR_ID_TOPSEED2          0x1784
 #define USB_DEVICE_ID_TOPSEED2_RF_COMBO 0x0004
+#define USB_DEVICE_ID_TOPSEED2_PERIPAD_701      0x0016
 
 #define USB_VENDOR_ID_TOPMAX            0x0663
 #define USB_DEVICE_ID_TOPMAX_COBRAPAD   0x0103
@@ -707,6 +745,8 @@
 #define USB_VENDOR_ID_WALTOP                            0x172f
 #define USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH       0x0032
 #define USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH      0x0034
+#define USB_DEVICE_ID_WALTOP_Q_PAD                      0x0037
+#define USB_DEVICE_ID_WALTOP_PID_0038                   0x0038
 #define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH     0x0501
 #define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH     0x0500
 
@@ -715,6 +755,7 @@
 #define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101
 #define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104
 #define USB_DEVICE_ID_8_8_4_IF_KIT      0x8201
+#define USB_DEVICE_ID_SUPER_JOY_BOX_3   0x8888
 #define USB_DEVICE_ID_QUAD_USB_JOYPAD   0x8800
 #define USB_DEVICE_ID_DUAL_USB_JOYPAD   0x8866