HID: multitouch: add more eGalax devices

This is a list of devices that should be handled by hid-multitouch.  They all
present the HID usage "Contact ID" and won't be handled by hid-input.  Some of
them have _not_ been tested (though I have their report descriptors), but I've
been guaranted by eeti that they follow the same protocol.  The tested ones are
also blacklisted in hid-core.c.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

3 files changed, 26 insertions, 0 deletions

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index bb710a6a079d..4f4143cc789b 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1409,6 +1409,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 10a9ca99e3f8..e5e32864d55d 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -238,11 +238,17 @@
 #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_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
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index c7ee03503ec7..0eda37f03c30 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -788,12 +788,27 @@ static const struct hid_device_id mt_devices[] = {
         { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                         USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                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_726B) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262) },
         { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                         USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA) },
         { .driver_data = MT_CLS_EGALAX,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                         USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA) },
@@ -802,6 +817,9 @@ static const struct hid_device_id mt_devices[] = {
                         USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) },
         { .driver_data = MT_CLS_EGALAX_SERIAL,
                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349) },
+        { .driver_data = MT_CLS_EGALAX_SERIAL,
+                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                         USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
 
         /* Elo TouchSystems IntelliTouch Plus panel */