Input: add driver for Dynapro serial touchscreen

This is a driver for Dynapro serial touchscreen, which used to be
supported in Xorg. The driver needs updated inputattach utility to
initialize serial port and create proper serio device before the
driver will be bound to it.

Signed-off-by: Tias Guns <tias@ulyssis.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 8cc453c..1cd9e8c 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -111,6 +111,18 @@ config TOUCHSCREEN_DA9034
          Say Y here to enable the support for the touchscreen found
          on Dialog Semiconductor DA9034 PMIC.
 
+config TOUCHSCREEN_DYNAPRO
+       tristate "Dynapro serial touchscreen"
+       select SERIO
+       help
+         Say Y here if you have a Dynapro 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 dynapro.
+
 config TOUCHSCREEN_EETI
        tristate "EETI touchscreen panel support"
        depends on I2C

diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 15fa62c..1f5cccd 100644 (file)
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_TOUCHSCREEN_ADS7846)     += ads7846.o
 obj-$(CONFIG_TOUCHSCREEN_ATMEL_TSADCC) += atmel_tsadcc.o
 obj-$(CONFIG_TOUCHSCREEN_BITSY)                += h3600_ts_input.o
 obj-$(CONFIG_TOUCHSCREEN_CORGI)                += corgi_ts.o
+obj-$(CONFIG_TOUCHSCREEN_DYNAPRO)      += dynapro.o
 obj-$(CONFIG_TOUCHSCREEN_GUNZE)                += gunze.o
 obj-$(CONFIG_TOUCHSCREEN_EETI)         += eeti_ts.o
 obj-$(CONFIG_TOUCHSCREEN_ELO)          += elo.o

diff --git a/drivers/input/touchscreen/dynapro.c b/drivers/input/touchscreen/dynapro.c
new file mode 100644 (file)
index 0000000..4553539
--- /dev/null
+++ b/drivers/input/touchscreen/dynapro.c
@@ -0,0 +1,206 @@
+/*
+ * Dynapro serial touchscreen driver
+ *
+ * Copyright (c) 2009 Tias Guns
+ * Based on the inexio driver (c) Vojtech Pavlik and Dan Streetman and
+ * Richard Lemon
+ *
+ */
+
+/*
+ * 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.
+ */
+
+/*
+ * 2009/09/19 Tias Guns <tias@ulyssis.org>
+ *   Copied inexio.c and edited for Dynapro protocol (from retired Xorg module)
+ */
+
+#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    "Dynapro serial touchscreen driver"
+
+MODULE_AUTHOR("Tias Guns <tias@ulyssis.org>");
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+
+/*
+ * Definitions & global arrays.
+ */
+
+#define DYNAPRO_FORMAT_TOUCH_BIT 0x40
+#define DYNAPRO_FORMAT_LENGTH 3
+#define DYNAPRO_RESPONSE_BEGIN_BYTE 0x80
+
+#define DYNAPRO_MIN_XC 0
+#define DYNAPRO_MAX_XC 0x3ff
+#define DYNAPRO_MIN_YC 0
+#define DYNAPRO_MAX_YC 0x3ff
+
+#define DYNAPRO_GET_XC(data) (data[1] | ((data[0] & 0x38) << 4))
+#define DYNAPRO_GET_YC(data) (data[2] | ((data[0] & 0x07) << 7))
+#define DYNAPRO_GET_TOUCHED(data) (DYNAPRO_FORMAT_TOUCH_BIT & data[0])
+
+/*
+ * Per-touchscreen data.
+ */
+
+struct dynapro {
+       struct input_dev *dev;
+       struct serio *serio;
+       int idx;
+       unsigned char data[DYNAPRO_FORMAT_LENGTH];
+       char phys[32];
+};
+
+static void dynapro_process_data(struct dynapro *pdynapro)
+{
+       struct input_dev *dev = pdynapro->dev;
+
+       if (DYNAPRO_FORMAT_LENGTH == ++pdynapro->idx) {
+               input_report_abs(dev, ABS_X, DYNAPRO_GET_XC(pdynapro->data));
+               input_report_abs(dev, ABS_Y, DYNAPRO_GET_YC(pdynapro->data));
+               input_report_key(dev, BTN_TOUCH,
+                                DYNAPRO_GET_TOUCHED(pdynapro->data));
+               input_sync(dev);
+
+               pdynapro->idx = 0;
+       }
+}
+
+static irqreturn_t dynapro_interrupt(struct serio *serio,
+               unsigned char data, unsigned int flags)
+{
+       struct dynapro *pdynapro = serio_get_drvdata(serio);
+
+       pdynapro->data[pdynapro->idx] = data;
+
+       if (DYNAPRO_RESPONSE_BEGIN_BYTE & pdynapro->data[0])
+               dynapro_process_data(pdynapro);
+       else
+               dev_dbg(&serio->dev, "unknown/unsynchronized data: %x\n",
+                       pdynapro->data[0]);
+
+       return IRQ_HANDLED;
+}
+
+static void dynapro_disconnect(struct serio *serio)
+{
+       struct dynapro *pdynapro = serio_get_drvdata(serio);
+
+       input_get_device(pdynapro->dev);
+       input_unregister_device(pdynapro->dev);
+       serio_close(serio);
+       serio_set_drvdata(serio, NULL);
+       input_put_device(pdynapro->dev);
+       kfree(pdynapro);
+}
+
+/*
+ * dynapro_connect() is the routine that is called when someone adds a
+ * new serio device that supports dynapro protocol and registers it as
+ * an input device. This is usually accomplished using inputattach.
+ */
+
+static int dynapro_connect(struct serio *serio, struct serio_driver *drv)
+{
+       struct dynapro *pdynapro;
+       struct input_dev *input_dev;
+       int err;
+
+       pdynapro = kzalloc(sizeof(struct dynapro), GFP_KERNEL);
+       input_dev = input_allocate_device();
+       if (!pdynapro || !input_dev) {
+               err = -ENOMEM;
+               goto fail1;
+       }
+
+       pdynapro->serio = serio;
+       pdynapro->dev = input_dev;
+       snprintf(pdynapro->phys, sizeof(pdynapro->phys),
+                "%s/input0", serio->phys);
+
+       input_dev->name = "Dynapro Serial TouchScreen";
+       input_dev->phys = pdynapro->phys;
+       input_dev->id.bustype = BUS_RS232;
+       input_dev->id.vendor = SERIO_DYNAPRO;
+       input_dev->id.product = 0;
+       input_dev->id.version = 0x0001;
+       input_dev->dev.parent = &serio->dev;
+       input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+       input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+       input_set_abs_params(pdynapro->dev, ABS_X,
+                            DYNAPRO_MIN_XC, DYNAPRO_MAX_XC, 0, 0);
+       input_set_abs_params(pdynapro->dev, ABS_Y,
+                            DYNAPRO_MIN_YC, DYNAPRO_MAX_YC, 0, 0);
+
+       serio_set_drvdata(serio, pdynapro);
+
+       err = serio_open(serio, drv);
+       if (err)
+               goto fail2;
+
+       err = input_register_device(pdynapro->dev);
+       if (err)
+               goto fail3;
+
+       return 0;
+
+ fail3:        serio_close(serio);
+ fail2:        serio_set_drvdata(serio, NULL);
+ fail1:        input_free_device(input_dev);
+       kfree(pdynapro);
+       return err;
+}
+
+/*
+ * The serio driver structure.
+ */
+
+static struct serio_device_id dynapro_serio_ids[] = {
+       {
+               .type   = SERIO_RS232,
+               .proto  = SERIO_DYNAPRO,
+               .id     = SERIO_ANY,
+               .extra  = SERIO_ANY,
+       },
+       { 0 }
+};
+
+MODULE_DEVICE_TABLE(serio, dynapro_serio_ids);
+
+static struct serio_driver dynapro_drv = {
+       .driver         = {
+               .name   = "dynapro",
+       },
+       .description    = DRIVER_DESC,
+       .id_table       = dynapro_serio_ids,
+       .interrupt      = dynapro_interrupt,
+       .connect        = dynapro_connect,
+       .disconnect     = dynapro_disconnect,
+};
+
+/*
+ * The functions for inserting/removing us as a module.
+ */
+
+static int __init dynapro_init(void)
+{
+       return serio_register_driver(&dynapro_drv);
+}
+
+static void __exit dynapro_exit(void)
+{
+       serio_unregister_driver(&dynapro_drv);
+}
+
+module_init(dynapro_init);
+module_exit(dynapro_exit);

diff --git a/include/linux/serio.h b/include/linux/serio.h
index a640bc2..e2f3044 100644 (file)
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -215,5 +215,6 @@ static inline void serio_unpin_driver(struct serio *serio)
 #define SERIO_INEXIO   0x37
 #define SERIO_TOUCHIT213       0x38
 #define SERIO_W8001    0x39
+#define SERIO_DYNAPRO  0x3a
 
 #endif