1 files changed, 81 insertions, 0 deletions

diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index fb7cb9bdfbd5..68ece5801a58 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -13,6 +13,7 @@
  *  - IdealTEK URTC1000
  *  - General Touch
  *  - GoTop Super_Q2/GogoPen/PenPower tablets
+ *  - JASTEC USB touch controller/DigiTech DTR-02U
  *
  * Copyright (C) 2004-2007 by Daniel Ritz <daniel.ritz@gmx.ch>
  * Copyright (C) by Todd E. Johnson (mtouchusb.c)
@@ -118,6 +119,8 @@ enum {
         DEVTYPE_IDEALTEK,
         DEVTYPE_GENERAL_TOUCH,
         DEVTYPE_GOTOP,
+        DEVTYPE_JASTEC,
+        DEVTYPE_E2I,
 };
 
 #define USB_DEVICE_HID_CLASS(vend, prod) \
@@ -191,11 +194,51 @@ static struct usb_device_id usbtouch_devices[] = {
         {USB_DEVICE(0x08f2, 0x00f4), .driver_info = DEVTYPE_GOTOP},
 #endif
 
+#ifdef CONFIG_TOUCHSCREEN_USB_JASTEC
+        {USB_DEVICE(0x0f92, 0x0001), .driver_info = DEVTYPE_JASTEC},
+#endif
+
+#ifdef CONFIG_TOUCHSCREEN_USB_E2I
+        {USB_DEVICE(0x1ac7, 0x0001), .driver_info = DEVTYPE_E2I},
+#endif
         {}
 };
 
 
 /*****************************************************************************
+ * e2i Part
+ */
+
+#ifdef CONFIG_TOUCHSCREEN_USB_E2I
+static int e2i_init(struct usbtouch_usb *usbtouch)
+{
+        int ret;
+
+        ret = usb_control_msg(usbtouch->udev, usb_rcvctrlpipe(usbtouch->udev, 0),
+                              0x01, 0x02, 0x0000, 0x0081,
+                              NULL, 0, USB_CTRL_SET_TIMEOUT);
+
+        dbg("%s - usb_control_msg - E2I_RESET - bytes|err: %d",
+            __func__, ret);
+        return ret;
+}
+
+static int e2i_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
+{
+        int tmp = (pkt[0] << 8) | pkt[1];
+        dev->x  = (pkt[2] << 8) | pkt[3];
+        dev->y  = (pkt[4] << 8) | pkt[5];
+
+        tmp = tmp - 0xA000;
+        dev->touch = (tmp > 0);
+        dev->press = (tmp > 0 ? tmp : 0);
+
+        return 1;
+}
+#endif
+
+
+/*****************************************************************************
  * eGalax part
  */
 
@@ -559,6 +602,21 @@ static int gotop_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
         dev->x = ((pkt[1] & 0x38) << 4) | pkt[2];
         dev->y = ((pkt[1] & 0x07) << 7) | pkt[3];
         dev->touch = pkt[0] & 0x01;
+
+        return 1;
+}
+#endif
+
+/*****************************************************************************
+ * JASTEC Part
+ */
+#ifdef CONFIG_TOUCHSCREEN_USB_JASTEC
+static int jastec_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
+{
+        dev->x = ((pkt[0] & 0x3f) << 6) | (pkt[2] & 0x3f);
+        dev->y = ((pkt[1] & 0x3f) << 6) | (pkt[3] & 0x3f);
+        dev->touch = (pkt[0] & 0x40) >> 6;
+
         return 1;
 }
 #endif
@@ -702,6 +760,29 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
                 .read_data      = gotop_read_data,
         },
 #endif
+
+#ifdef CONFIG_TOUCHSCREEN_USB_JASTEC
+        [DEVTYPE_JASTEC] = {
+                .min_xc         = 0x0,
+                .max_xc         = 0x0fff,
+                .min_yc         = 0x0,
+                .max_yc         = 0x0fff,
+                .rept_size      = 4,
+                .read_data      = jastec_read_data,
+        },
+#endif
+
+#ifdef CONFIG_TOUCHSCREEN_USB_E2I
+        [DEVTYPE_E2I] = {
+                .min_xc         = 0x0,
+                .max_xc         = 0x7fff,
+                .min_yc         = 0x0,
+                .max_yc         = 0x7fff,
+                .rept_size      = 6,
+                .init           = e2i_init,
+                .read_data      = e2i_read_data,
+        },
+#endif
 };