]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Input: usbtouchscreen - add new model from IRTOUCHSYSTEMS
authorLars Poeschel <poeschel@lemonage.de>
Tue, 24 Mar 2015 16:25:10 +0000 (09:25 -0700)
committerJiri Slaby <jslaby@suse.cz>
Tue, 26 May 2015 14:26:56 +0000 (16:26 +0200)
commit dbea4032f8024e5ea886341f7c39cf023e30e828 upstream.

This adds support for another model of IRTOUCH SYSTEMS Co.,LtD infrared
touchscreens. The USB vendorID/deviceID is 6615/0012. It is also sold
under the label "Elektrosil".

The datasheet states that coordinates for x and y are in the range from
0 to 32767.

Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/input/touchscreen/usbtouchscreen.c

index 5f87bed054674b487e724d3588806235b5b5f738..e565530e3596361fe82b109446b7780cc7f6bde1 100644 (file)
@@ -133,6 +133,7 @@ enum {
        DEVTYPE_GUNZE,
        DEVTYPE_DMC_TSC10,
        DEVTYPE_IRTOUCH,
+       DEVTYPE_IRTOUCH_HIRES,
        DEVTYPE_IDEALTEK,
        DEVTYPE_GENERAL_TOUCH,
        DEVTYPE_GOTOP,
@@ -199,6 +200,7 @@ static const struct usb_device_id usbtouch_devices[] = {
 #ifdef CONFIG_TOUCHSCREEN_USB_IRTOUCH
        {USB_DEVICE(0x595a, 0x0001), .driver_info = DEVTYPE_IRTOUCH},
        {USB_DEVICE(0x6615, 0x0001), .driver_info = DEVTYPE_IRTOUCH},
+       {USB_DEVICE(0x6615, 0x0012), .driver_info = DEVTYPE_IRTOUCH_HIRES},
 #endif
 
 #ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK
@@ -1178,6 +1180,15 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
                .rept_size      = 8,
                .read_data      = irtouch_read_data,
        },
+
+       [DEVTYPE_IRTOUCH_HIRES] = {
+               .min_xc         = 0x0,
+               .max_xc         = 0x7fff,
+               .min_yc         = 0x0,
+               .max_yc         = 0x7fff,
+               .rept_size      = 8,
+               .read_data      = irtouch_read_data,
+       },
 #endif
 
 #ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK