The patch titled
usb: Support for DMC TSC-10
has been removed from the -mm tree. Its filename was
usb-support-for-dmc-tsc-10-take-2.patch
This patch was dropped because it is obsolete
------------------------------------------------------
Subject: usb: Support for DMC TSC-10
From: Holger Schurig <hs4233@xxxxxxxxxxxxxxxxxxxx>
Basic support support for the USB-based DMC TSC-10 touchscreen controller.
Signed-off-by: Holger Schurig <hs4233@xxxxxxxxxxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Daniel Ritz <daniel.ritz@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/usb/input/Kconfig | 28 ++++---
drivers/usb/input/usbtouchscreen.c | 105 +++++++++++++++++++++++++--
2 files changed, 117 insertions(+), 16 deletions(-)
diff -puN drivers/usb/input/Kconfig~usb-support-for-dmc-tsc-10-take-2 drivers/usb/input/Kconfig
--- a/drivers/usb/input/Kconfig~usb-support-for-dmc-tsc-10-take-2
+++ a/drivers/usb/input/Kconfig
@@ -221,6 +221,7 @@ config USB_TOUCHSCREEN
- ITM
- some other eTurboTouch
- Gunze AHL61
+ - DMC TSC-10/25
Have a look at <http://linux.chapter7.ch/touchkit/> for
a usage description and the required user-space stuff.
@@ -228,24 +229,19 @@ config USB_TOUCHSCREEN
To compile this driver as a module, choose M here: the
module will be called usbtouchscreen.
-config USB_TOUCHSCREEN_EGALAX
- default y
- bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
- depends on USB_TOUCHSCREEN
-
-config USB_TOUCHSCREEN_PANJIT
+config USB_TOUCHSCREEN_3M
default y
- bool "PanJit device support" if EMBEDDED
+ bool "3M/Microtouch EX II series device support" if EMBEDDED
depends on USB_TOUCHSCREEN
-config USB_TOUCHSCREEN_3M
+config USB_TOUCHSCREEN_DMC_TSC1025
default y
- bool "3M/Microtouch EX II series device support" if EMBEDDED
+ bool "DMC TSC-10/25 device support" if EMBEDDED
depends on USB_TOUCHSCREEN
-config USB_TOUCHSCREEN_ITM
+config USB_TOUCHSCREEN_EGALAX
default y
- bool "ITM device support" if EMBEDDED
+ bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
depends on USB_TOUCHSCREEN
config USB_TOUCHSCREEN_ETURBO
@@ -258,6 +254,16 @@ config USB_TOUCHSCREEN_GUNZE
bool "Gunze AHL61 device support" if EMBEDDED
depends on USB_TOUCHSCREEN
+config USB_TOUCHSCREEN_ITM
+ default y
+ bool "ITM device support" if EMBEDDED
+ depends on USB_TOUCHSCREEN
+
+config USB_TOUCHSCREEN_PANJIT
+ default y
+ bool "PanJit device support" if EMBEDDED
+ depends on USB_TOUCHSCREEN
+
config USB_YEALINK
tristate "Yealink usb-p1k voip phone"
depends on USB && INPUT && EXPERIMENTAL
diff -puN drivers/usb/input/usbtouchscreen.c~usb-support-for-dmc-tsc-10-take-2 drivers/usb/input/usbtouchscreen.c
--- a/drivers/usb/input/usbtouchscreen.c~usb-support-for-dmc-tsc-10-take-2
+++ a/drivers/usb/input/usbtouchscreen.c
@@ -1,13 +1,13 @@
/******************************************************************************
* usbtouchscreen.c
* Driver for USB Touchscreens, supporting those devices:
- * - eGalax Touchkit
- * includes eTurboTouch CT-410/510/700
* - 3M/Microtouch EX II series
- * - ITM
- * - PanJit TouchSet
+ * - DMC TSC-10/25
+ * - eGalax Touchkit includes eTurboTouch CT-410/510/700
* - eTurboTouch
* - Gunze AHL61
+ * - ITM
+ * - PanJit TouchSet
*
* Copyright (C) 2004-2006 by Daniel Ritz <daniel.ritz@xxxxxx>
* Copyright (C) by Todd E. Johnson (mtouchusb.c)
@@ -30,6 +30,8 @@
* - ITM parts are from itmtouch.c
* - 3M parts are from mtouchusb.c
* - PanJit parts are from an unmerged driver by Lanslott Gish
+ * - DMC TSC 10/25 are from Holger Schurig, with ideas from an unmerged
+ * driver from Marius Vollmer
*
*****************************************************************************/
@@ -44,7 +46,7 @@
#include <linux/usb/input.h>
-#define DRIVER_VERSION "v0.4"
+#define DRIVER_VERSION "v0.5"
#define DRIVER_AUTHOR "Daniel Ritz <daniel.ritz@xxxxxx>"
#define DRIVER_DESC "USB Touchscreen Driver"
@@ -103,6 +105,7 @@ enum {
DEVTYPE_ITM,
DEVTYPE_ETURBO,
DEVTYPE_GUNZE,
+ DEVTYPE_DMC_TSC1025,
};
static struct usb_device_id usbtouch_devices[] = {
@@ -139,6 +142,10 @@ static struct usb_device_id usbtouch_dev
{USB_DEVICE(0x0637, 0x0001), .driver_info = DEVTYPE_GUNZE},
#endif
+#ifdef CONFIG_USB_TOUCHSCREEN_DMC_TSC1025
+ {USB_DEVICE(0x0afa, 0x03e8), .driver_info = DEVTYPE_DMC_TSC1025},
+#endif
+
{}
};
@@ -313,6 +320,82 @@ static int gunze_read_data(unsigned char
#endif
/*****************************************************************************
+ * DMC TSC-10/25 Part
+ *
+ * Documentation about the controller and its protocol can be found at
+ * http://www.dmccoltd.com/files/controler/tsc10usb_pi_e.pdf
+ * http://www.dmccoltd.com/files/controler/tsc25_usb_e.pdf
+ */
+#ifdef CONFIG_USB_TOUCHSCREEN_DMC_TSC1025
+
+/* At which rate should coordinates transferred? This list goes from
+ * slowest rate to fastest rate. */
+#define TSC1025_RATE_POINT 0x50
+#define TSC1025_RATE_30 0x40
+#define TSC1025_RATE_50 0x41
+#define TSC1025_RATE_80 0x42
+#define TSC1025_RATE_100 0x43
+#define TSC1025_RATE_130 0x44
+#define TSC1025_RATE_150 0x45
+
+/* Some commands that we send */
+#define TSC1025_CMD_RESET 0x55
+#define TSC1025_CMD_RATE 0x05
+#define TSC1025_CMD_DATA1 0x01
+
+static int dmc_tsc1025_init(struct usbtouch_usb *usbtouch)
+{
+ int ret;
+ unsigned char buf[2];
+ struct usb_device *dev = usbtouch->udev;
+
+ /* reset */
+ buf[0] = buf[1] = 0xFF;
+ ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+ TSC1025_CMD_RESET,
+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ 0, 0, buf, 2, USB_CTRL_SET_TIMEOUT);
+ if (ret < 0)
+ return ret;
+ /* Expect normal response */
+ if (buf[0] != 0x06 || buf[1] != 0x00)
+ return -ENODEV;
+
+ /* Set Coordinate output rate setting */
+ buf[0] = buf[1] = 0xFF;
+ ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+ TSC1025_CMD_RATE,
+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ TSC1025_RATE_150, 0, buf, 2, USB_CTRL_SET_TIMEOUT);
+ if (ret < 0)
+ return ret;
+ /* Expect normal response */
+ if (buf[0] != 0x06 || buf[1] != 0x00)
+ return -ENODEV;
+
+ /* Coordinate data send start */
+ ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+ TSC1025_CMD_DATA1,
+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ 0, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static int dmc_tsc1025_read_data(unsigned char *pkt, int *x, int *y,
+ int *touch, int *press)
+{
+ *x = ((pkt[2] & 0x03) << 8) | pkt[1];
+ *y = ((pkt[4] & 0x03) << 8) | pkt[3];
+ *touch = pkt[0] & 0x01;
+
+ return 1;
+}
+#endif
+
+/*****************************************************************************
* the different device descriptors
*/
static struct usbtouch_device_info usbtouch_dev_info[] = {
@@ -389,6 +472,18 @@ static struct usbtouch_device_info usbto
.read_data = gunze_read_data,
},
#endif
+
+#ifdef CONFIG_USB_TOUCHSCREEN_DMC_TSC1025
+ [DEVTYPE_DMC_TSC1025] = {
+ .min_xc = 0x0,
+ .max_xc = 0x03ff,
+ .min_yc = 0x0,
+ .max_yc = 0x03ff,
+ .rept_size = 5,
+ .init = dmc_tsc1025_init,
+ .read_data = dmc_tsc1025_read_data,
+ },
+#endif
};
_
Patches currently in -mm which might be from hs4233@xxxxxxxxxxxxxxxxxxxx are
fix-warning-in-speedstep-centrinoc.patch
usb-support-for-dmc-tsc-10-take-2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
