Re: [PATCH] Add support for HTC Shift Touchscreen
From: Pau Oliva Fora
Date: Mon May 19 2008 - 11:19:53 EST
From: Pau Oliva Fora <pau@xxxxxxxxxx>
The patch below adds support for HTC Shift UMPC touchscreen.
Signed-off-by: Pau Oliva Fora <pau@xxxxxxxxxx>
---
Patch against linux-2.6.25.4, should apply clean on other versions too.
Includes all the suggestions from Sam Ravnborg, Pekka Enberg and Marcin Slusarz.
Thank you all for your help, hopefully everything is ok now.
diff -uprN linux-2.6.25.4/drivers/input/touchscreen/htcpen.c linux/drivers/input/touchscreen/htcpen.c
--- linux-2.6.25.4/drivers/input/touchscreen/htcpen.c 1970-01-01 01:00:00.000000000 +0100
+++ linux/drivers/input/touchscreen/htcpen.c 2008-05-19 15:23:25.000000000 +0200
@@ -0,0 +1,205 @@
+/*
+ * HTC Shift touchscreen driver
+ *
+ * Copyright (C) 2008 Pau Oliva Fora <pof@xxxxxxxxxx>
+ *
+ * Thanks to:
+ * Heikki Linnakangas - Penmount LPC touchscreen driver
+ * Wacom / Ping Cheng - Help on linuxwacom-devel
+ * Esteve Espuna - Ideas, tips, moral support :)
+ *
+ * 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/input.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/isa.h>
+
+#define DRIVER_VERSION "0.8"
+#define DRIVER_DESC "HTC Shift touchscreen driver v" DRIVER_VERSION
+
+MODULE_AUTHOR("Pau Oliva Fora <pau@xxxxxxxxxx>");
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_LICENSE("GPL");
+
+#define HTCPEN_PORT_IRQ_CLEAR 0x068
+#define HTCPEN_PORT_INIT 0x06c
+#define HTCPEN_PORT_INDEX 0x0250
+#define HTCPEN_PORT_DATA 0x0251
+#define HTCPEN_IRQ 3
+
+#define X_INDEX 3
+#define Y_INDEX 5
+#define LSB_XY_INDEX 0xc
+#define X_AXIS_MAX 2040
+#define Y_AXIS_MAX 2040
+#define DEVICE_ENABLE 0xa2
+
+static int inverse_x;
+module_param(inverse_x, bool, 0644);
+MODULE_PARM_DESC(inverse_x, "If set X axis is inversed");
+static int inverse_y;
+module_param(inverse_y, bool, 0644);
+MODULE_PARM_DESC(inverse_y, "If set Y axis is inversed");
+
+static void poll_htcpen(struct input_dev *htcpen_dev)
+{
+ unsigned short x, y, xy;
+ unsigned short touch;
+
+ /* 0=press ; 1=release */
+ outb_p(0xb, HTCPEN_PORT_INDEX);
+ touch = inb_p(HTCPEN_PORT_DATA);
+ if (touch)
+ touch = 0;
+ else
+ touch = 1;
+
+ input_report_key(htcpen_dev, BTN_TOUCH, touch);
+
+ /* only update X/Y when screen is being touched */
+ if (touch) {
+ outb_p(X_INDEX, HTCPEN_PORT_INDEX);
+ x = inb_p(HTCPEN_PORT_DATA);
+
+ outb_p(Y_INDEX, HTCPEN_PORT_INDEX);
+ y = inb_p(HTCPEN_PORT_DATA);
+
+ outb_p(LSB_XY_INDEX, HTCPEN_PORT_INDEX);
+ xy = inb_p(HTCPEN_PORT_DATA);
+
+ /* get high resolution value of X and Y using LSB */
+ x = X_AXIS_MAX - ((x * 8) + ((xy >> 4) & 0xf));
+ y = (y * 8) + (xy & 0xf);
+ if (inverse_x)
+ x = X_AXIS_MAX - x;
+ if (inverse_y)
+ y = Y_AXIS_MAX - y;
+
+ input_report_abs(htcpen_dev, ABS_X, x);
+ input_report_abs(htcpen_dev, ABS_Y, y);
+ }
+
+ input_sync(htcpen_dev);
+
+ inb_p(HTCPEN_PORT_IRQ_CLEAR);
+}
+
+static irqreturn_t htcpen_interrupt(int irq, void *handle)
+{
+ struct input_dev *htcpen_dev = handle;
+
+ poll_htcpen(htcpen_dev);
+ return IRQ_HANDLED;
+}
+
+static int __devinit htcpen_isa_probe(struct device *dev, unsigned int id)
+{
+ int err;
+ struct input_dev *htcpen_dev;
+
+ printk(KERN_INFO "htcpen: %s\n", DRIVER_DESC);
+
+ inb_p(HTCPEN_PORT_IRQ_CLEAR);
+
+ htcpen_dev = input_allocate_device();
+ if (!htcpen_dev) {
+ printk(KERN_ERR "htcpen: can't allocate device\n");
+ err = -ENOMEM;
+ goto input_alloc_failed;
+ }
+
+ htcpen_dev->name = "HTC Pen TouchScreen";
+ htcpen_dev->id.bustype = BUS_ISA;
+ htcpen_dev->id.vendor = 0;
+ htcpen_dev->id.product = 0;
+ htcpen_dev->id.version = 0;
+
+ input_set_abs_params(htcpen_dev, ABS_X, 0, X_AXIS_MAX, 0, 0);
+ input_set_abs_params(htcpen_dev, ABS_Y, 0, Y_AXIS_MAX, 0, 0);
+
+ htcpen_dev->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY);
+ htcpen_dev->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y);
+ htcpen_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+
+ err = request_irq(HTCPEN_IRQ, htcpen_interrupt, 0, "htcpen",
+ htcpen_dev);
+ if (err) {
+ printk(KERN_ERR "htcpen: irq busy\n");
+ err = -EBUSY;
+ goto request_irq_failed;
+ }
+
+ err = input_register_device(htcpen_dev);
+ if (err)
+ goto input_register_failed;
+
+ outb_p(DEVICE_ENABLE, HTCPEN_PORT_INIT);
+
+ dev_set_drvdata(dev, htcpen_dev);
+ return 0;
+
+ input_register_failed:
+ free_irq(HTCPEN_IRQ, htcpen_dev);
+ request_irq_failed:
+ input_free_device(htcpen_dev);
+ input_alloc_failed:
+ return err;
+}
+
+static int __devinit htcpen_isa_match(struct device *dev, unsigned int id)
+{
+ unsigned short val1, val2;
+
+ /* device detection */
+ outb_p(0x8, HTCPEN_PORT_INIT);
+ val1 = inb_p(HTCPEN_PORT_INIT);
+ val2 = inb_p(HTCPEN_PORT_IRQ_CLEAR);
+ if ((val1 > 0xa) || (val2 != 0x55)) {
+ printk(KERN_ERR "htcpen: no such device (%x|%x)\n", val1, val2);
+ return 0;
+ }
+ return 1;
+}
+
+static int __devexit htcpen_isa_remove(struct device *dev, unsigned int id)
+{
+ input_unregister_device(dev_get_drvdata(dev));
+ free_irq(HTCPEN_IRQ, dev_get_drvdata(dev));
+ input_free_device(dev_get_drvdata(dev));
+ dev_set_drvdata(dev, NULL);
+ printk(KERN_INFO "htcpen: module removed\n");
+ return 0;
+}
+
+static struct isa_driver htcpen_isa_driver = {
+ .match = htcpen_isa_match,
+ .probe = htcpen_isa_probe,
+ .remove = __devexit_p(htcpen_isa_remove),
+ .driver = {
+ .owner = THIS_MODULE,
+ .name = "htcpen",
+ }
+};
+
+static int __init htcpen_isa_init(void)
+{
+ return isa_register_driver(&htcpen_isa_driver, 1);
+}
+
+static void __exit htcpen_isa_exit(void)
+{
+ isa_unregister_driver(&htcpen_isa_driver);
+}
+
+module_init(htcpen_isa_init);
+module_exit(htcpen_isa_exit);
diff -uprN linux-2.6.25.4/drivers/input/touchscreen/Kconfig linux/drivers/input/touchscreen/Kconfig
--- linux-2.6.25.4/drivers/input/touchscreen/Kconfig 2008-05-15 17:00:12.000000000 +0200
+++ linux/drivers/input/touchscreen/Kconfig 2008-05-19 15:48:52.000000000 +0200
@@ -134,6 +134,18 @@ config TOUCHSCREEN_HP7XX
To compile this driver as a module, choose M here: the
module will be called jornada720_ts.
+config TOUCHSCREEN_HTCPEN
+ tristate "HTC Shift X9500 touchscreen"
+ depends on ISA
+ help
+ Say Y here if you have an HTC Shift UMPC also known as HTC X9500
+ Clio / Shangrila and want to support the built-in touchscreen.
+
+ If unsure, say N.
+
+ To compile this driver as a module, choose M here: the
+ module will be called htcpen.
+
config TOUCHSCREEN_PENMOUNT
tristate "Penmount serial touchscreen"
select SERIO
diff -uprN linux-2.6.25.4/drivers/input/touchscreen/Makefile linux/drivers/input/touchscreen/Makefile
--- linux-2.6.25.4/drivers/input/touchscreen/Makefile 2008-05-15 17:00:12.000000000 +0200
+++ linux/drivers/input/touchscreen/Makefile 2008-05-17 03:10:12.000000000 +0200
@@ -14,6 +14,7 @@ obj-$(CONFIG_TOUCHSCREEN_MTOUCH) += mtou
obj-$(CONFIG_TOUCHSCREEN_MK712) += mk712.o
obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680_ts_input.o
obj-$(CONFIG_TOUCHSCREEN_HP7XX) += jornada720_ts.o
+obj-$(CONFIG_TOUCHSCREEN_HTCPEN) += htcpen.o
obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE) += usbtouchscreen.o
obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o
obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o
--- linux-2.6.25.4/MAINTAINERS 2008-05-15 17:00:12.000000000 +0200
+++ linux/MAINTAINERS 2008-05-19 15:40:11.000000000 +0200
@@ -1875,6 +1875,12 @@ M: mikulas@xxxxxxxxxxxxxxxxxxxxxxxx
W: http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
S: Maintained
+HTCPEN TOUCHSCREEN DRIVER
+P: Pau Oliva Fora
+M: pof@xxxxxxxxxx
+L: linux-input@xxxxxxxxxxxxxxx
+S: Maintained
+
HUGETLB FILESYSTEM
P: William Irwin
M: wli@xxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/