4 files changed, 210 insertions, 0 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index fa038126d508..216db1229376 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -120,4 +120,16 @@ config TOUCHSCREEN_PENMOUNT
           To compile this driver as a module, choose M here: the
           module will be called penmount.
 
+config TOUCHSCREEN_TOUCHRIGHT
+        tristate "Touchright serial touchscreen"
+        select SERIO
+        help
+          Say Y here if you have a Touchright serial touchscreen connected to
+          your system.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called touchright.
+
 endif
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 72e7be8097a4..deda25e36807 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_TOUCHSCREEN_MTOUCH) += mtouch.o
 obj-$(CONFIG_TOUCHSCREEN_MK712) += mk712.o
 obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680_ts_input.o
 obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)      += penmount.o
+obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)    += touchright.o
diff --git a/drivers/input/touchscreen/touchright.c b/drivers/input/touchscreen/touchright.c
new file mode 100644
index 000000000000..1c89fa538651
--- /dev/null
+++ b/drivers/input/touchscreen/touchright.c
@@ -0,0 +1,196 @@
+/*
+ * Touchright serial touchscreen driver
+ *
+ * Copyright (c) 2006 Rick Koch <n1gp@hotmail.com>
+ *
+ * Based on MicroTouch driver (drivers/input/touchscreen/mtouch.c)
+ * Copyright (c) 2004 Vojtech Pavlik
+ * and Dan Streetman <ddstreet@ieee.org>
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/input.h>
+#include <linux/serio.h>
+#include <linux/init.h>
+
+#define DRIVER_DESC     "Touchright serial touchscreen driver"
+
+MODULE_AUTHOR("Rick Koch <n1gp@hotmail.com>");
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+
+/*
+ * Definitions & global arrays.
+ */
+
+#define TR_FORMAT_TOUCH_BIT     0x01
+#define TR_FORMAT_STATUS_BYTE   0x40
+#define TR_FORMAT_STATUS_MASK   ~TR_FORMAT_TOUCH_BIT
+
+#define TR_LENGTH 5
+
+#define TR_MIN_XC 0
+#define TR_MAX_XC 0x1ff
+#define TR_MIN_YC 0
+#define TR_MAX_YC 0x1ff
+
+/*
+ * Per-touchscreen data.
+ */
+
+struct tr {
+        struct input_dev *dev;
+        struct serio *serio;
+        int idx;
+        unsigned char data[TR_LENGTH];
+        char phys[32];
+};
+
+static irqreturn_t tr_interrupt(struct serio *serio,
+                unsigned char data, unsigned int flags, struct pt_regs *regs)
+{
+        struct tr *tr = serio_get_drvdata(serio);
+        struct input_dev *dev = tr->dev;
+
+        tr->data[tr->idx] = data;
+
+        if ((tr->data[0] & TR_FORMAT_STATUS_MASK) == TR_FORMAT_STATUS_BYTE) {
+                if (++tr->idx == TR_LENGTH) {
+                        input_regs(dev, regs);
+                        input_report_abs(dev, ABS_X,
+                                (tr->data[1] << 5) | (tr->data[2] >> 1));
+                        input_report_abs(dev, ABS_Y,
+                                (tr->data[3] << 5) | (tr->data[4] >> 1));
+                        input_report_key(dev, BTN_TOUCH,
+                                tr->data[0] & TR_FORMAT_TOUCH_BIT);
+                        input_sync(dev);
+                        tr->idx = 0;
+                }
+        }
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * tr_disconnect() is the opposite of tr_connect()
+ */
+
+static void tr_disconnect(struct serio *serio)
+{
+        struct tr *tr = serio_get_drvdata(serio);
+
+        input_get_device(tr->dev);
+        input_unregister_device(tr->dev);
+        serio_close(serio);
+        serio_set_drvdata(serio, NULL);
+        input_put_device(tr->dev);
+        kfree(tr);
+}
+
+/*
+ * tr_connect() is the routine that is called when someone adds a
+ * new serio device that supports the Touchright protocol and registers it as
+ * an input device.
+ */
+
+static int tr_connect(struct serio *serio, struct serio_driver *drv)
+{
+        struct tr *tr;
+        struct input_dev *input_dev;
+        int err;
+
+        tr = kzalloc(sizeof(struct tr), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!tr || !input_dev) {
+                err = -ENOMEM;
+                goto fail1;
+        }
+
+        tr->serio = serio;
+        tr->dev = input_dev;
+        snprintf(tr->phys, sizeof(tr->phys), "%s/input0", serio->phys);
+
+        input_dev->private = tr;
+        input_dev->name = "Touchright Serial TouchScreen";
+        input_dev->phys = tr->phys;
+        input_dev->id.bustype = BUS_RS232;
+        input_dev->id.vendor = SERIO_TOUCHRIGHT;
+        input_dev->id.product = 0;
+        input_dev->id.version = 0x0100;
+        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_set_abs_params(tr->dev, ABS_X, TR_MIN_XC, TR_MAX_XC, 0, 0);
+        input_set_abs_params(tr->dev, ABS_Y, TR_MIN_YC, TR_MAX_YC, 0, 0);
+
+        serio_set_drvdata(serio, tr);
+
+        err = serio_open(serio, drv);
+        if (err)
+                goto fail2;
+
+        err = input_register_device(tr->dev);
+        if (err)
+                goto fail3;
+
+        return 0;
+
+ fail3: serio_close(serio);
+ fail2: serio_set_drvdata(serio, NULL);
+ fail1: input_free_device(input_dev);
+        kfree(tr);
+        return err;
+}
+
+/*
+ * The serio driver structure.
+ */
+
+static struct serio_device_id tr_serio_ids[] = {
+        {
+                .type   = SERIO_RS232,
+                .proto  = SERIO_TOUCHRIGHT,
+                .id     = SERIO_ANY,
+                .extra  = SERIO_ANY,
+        },
+        { 0 }
+};
+
+MODULE_DEVICE_TABLE(serio, tr_serio_ids);
+
+static struct serio_driver tr_drv = {
+        .driver         = {
+                .name   = "touchright",
+        },
+        .description    = DRIVER_DESC,
+        .id_table       = tr_serio_ids,
+        .interrupt      = tr_interrupt,
+        .connect        = tr_connect,
+        .disconnect     = tr_disconnect,
+};
+
+/*
+ * The functions for inserting/removing us as a module.
+ */
+
+static int __init tr_init(void)
+{
+        serio_register_driver(&tr_drv);
+        return 0;
+}
+
+static void __exit tr_exit(void)
+{
+        serio_unregister_driver(&tr_drv);
+}
+
+module_init(tr_init);
+module_exit(tr_exit);
diff --git a/include/linux/serio.h b/include/linux/serio.h
index ad546a0205c6..152606413158 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -218,5 +218,6 @@ static inline void serio_unpin_driver(struct serio *serio)
 #define SERIO_ELO       0x29
 #define SERIO_MICROTOUCH        0x30
 #define SERIO_PENMOUNT  0x31
+#define SERIO_TOUCHRIGHT        0x32
 
 #endif