Touchscreen driver for the DTS413
Subsystems (2)
PATCH 1/1 Touchscreen driver for the DTS413
Hi,
we have developed a support for a nice capacitive ITO touchscreen from Densitron (DTS413). It is connected to the I2C bus.
Simple DTS413 Touchscreen driver.
(quoted diff) +0 -0
b/drivers/input/touchscreen/Kconfig
index ab02d72..b2403f5 100644
drivers/input/touchscreen/Kconfig +11 -0
@@ -510,6 +510,17 @@ config TOUCHSCREEN_W90X900 To compile this driver as a module, choose M here: the module will be called w90p910_ts. +config TOUCHSCREEN_DTS413 + tristate "DTS413 based touchscreens" + depends on I2C + help + Say Y here if you have a DTS413 based touchscreen. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called dts413. + config TOUCHSCREEN_PCAP tristate "Motorola PCAP touchscreen" depends on EZX_PCAP
(quoted diff) +0 -0
b/drivers/input/touchscreen/Makefile
index 4599bf7..be7315b 100644
drivers/input/touchscreen/Makefile +2 -0
@@ -40,4 +40,6 @@ obj-$(CONFIG_TOUCHSCREEN_WM97XX_ATMEL) += atmel-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE) += zylonite-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_W90X900) += w90p910_ts.o +obj-$(CONFIG_TOUCHSCREEN_DTS413) += dts413.o obj-$(CONFIG_TOUCHSCREEN_PCAP) += pcap_ts.o +
(quoted diff) +0 -0
b/drivers/input/touchscreen/dts413.c
new file mode 100644
index 0000000..b7a43af
drivers/input/touchscreen/dts413.c new file +194 -0
194 lines not on this page · raw message
IRQF_TRIGGER_FALLING/*IRQF_TRIGGER_LOW*/,
+ client->name, priv);
+ if (error) {
+ dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
+ goto err2;
+ }
+
+ device_init_wakeup(&client->dev, 1);
+ return 0;
+
+ err2:
+ input_unregister_device(input);
+ input = NULL; /* so we dont try to free it below */
+ err1:
+ input_free_device(input);
+ kfree(priv);
+ err0:
+ dev_set_drvdata(&client->dev, NULL);
+ return error;
+}
+
+static int dts413_remove(struct i2c_client *client)
+{
+ struct dts413 *priv = dev_get_drvdata(&client->dev);
+
+ free_irq(priv->irq, priv);
+ input_unregister_device(priv->input);
+ kfree(priv);
+
+ dev_set_drvdata(&client->dev, NULL);
+
+ return 0;
+}
+
+static int dts413_suspend(struct i2c_client *client, pm_message_t mesg) +{
+ struct dts413 *priv = dev_get_drvdata(&client->dev);
+
+ if (device_may_wakeup(&client->dev))
+ enable_irq_wake(priv->irq);
+
+ return 0;
+}
+
+static int dts413_resume(struct i2c_client *client)
+{
+ struct dts413 *priv = dev_get_drvdata(&client->dev);
+
+ if (device_may_wakeup(&client->dev))
+ disable_irq_wake(priv->irq);
+
+ return 0;
+}
+
+static struct i2c_device_id dts413_idtable[] = {
+ { "dts413", 0 },
+ { }
+};
+
+MODULE_DEVICE_TABLE(i2c, dts413_idtable);
+
+static struct i2c_driver dts413_driver = {
+ .driver = {
+ .owner = THIS_MODULE,
+ .name = "dts413"
+ },
+ .id_table = dts413_idtable,
+ .probe = dts413_probe,
+ .remove = __devexit_p(dts413_remove),
+ .suspend = dts413_suspend,
+ .resume = dts413_resume,
+};
+
+static int __init dts413_init(void)
+{
+ return i2c_add_driver(&dts413_driver);
+}
+
+static void __exit dts413_exit(void)
+{
+ i2c_del_driver(&dts413_driver);
+}
+
+module_init(dts413_init);
+module_exit(dts413_exit);
+
+MODULE_AUTHOR("Jernej Turnsek <[email protected]>"); +MODULE_DESCRIPTION("DTS413 Touch Screen Controller driver"); +MODULE_LICENSE("GPL");
PATCH 1/1 Touchscreen driver for the DTS413
Quoted 4 lines · Jernej Turnsek
Hi,
we have developed a support for a nice capacitive ITO touchscreen from Densitron (DTS413). It is connected to the I2C bus.
you've failed to send to the linux-input list, the first port of call for any _input_ related drivers. A CC: to the relevant i2c list would have been nice.
Quoted 58 lines
Simple DTS413 Touchscreen driver.
Signed-off-by Jernej Turnsek <[email protected]>drivers/input/touchscreen/Kconfig +11
-0@@ -510,6 +510,17 @@ config TOUCHSCREEN_W90X900 To compile this driver as a module, choose M here: the module will be called w90p910_ts. +config TOUCHSCREEN_DTS413 + tristate "DTS413 based touchscreens" + depends on I2C + help + Say Y here if you have a DTS413 based touchscreen. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called dts413. + config TOUCHSCREEN_PCAP tristate "Motorola PCAP touchscreen" depends on EZX_PCAPdrivers/input/touchscreen/Makefile +2
-0@@ -40,4 +40,6 @@ obj-$(CONFIG_TOUCHSCREEN_WM97XX_ATMEL) += atmel-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE) += zylonite-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_W90X900) += w90p910_ts.o +obj-$(CONFIG_TOUCHSCREEN_DTS413) += dts413.o obj-$(CONFIG_TOUCHSCREEN_PCAP) += pcap_ts.o +drivers/input/touchscreen/dts413.c new file +12
-0@@ -0,0 +1,282 @@ +/* +* drivers/input/touchscreen/dts413.c +* +* Copyright (c) 2009 Iskraemeco d.d. +* Jernej Turnsek <[email protected]> +* +* Using code from: +* - migor_ts.c +* Copyright (c) 2008 Magnus Damm +* Copyright (c) 2007 Ujjwal Pande <[email protected]>, +* Kenati Technologies Pvt Ltd. +*
drivers/input/touchscreen/dts413.c line 22
Quoted 10 lines
drivers/input/touchscreen/dts413.c new file +10
-0+* 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/module.h> +#include <linux/kernel.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <asm/io.h>
<asm/io.h> not for use in drivers, <linux/io.h> here
Quoted 12 lines
drivers/input/touchscreen/dts413.c new file +12
-0+#include <linux/i2c.h> +#include <linux/timer.h> + +#define MAX_11BIT ((1 << 11) - 1) + +#define EVENT_PENDOWN 1 +#define EVENT_PENUP 0 + +struct ts_event { +u8 byte0_stat:1 ; +u8 byte0_res :7 ; +u8 byte1_xpos_msb :4 ;
drivers/input/touchscreen/dts413.c line 44
Quoted 10 lines
drivers/input/touchscreen/dts413.c new file +10
-0+ u8 byte1_res : 4; + u8 byte2_xpos_lsb : 7; + u8 byte2_res : 1; + u8 byte3_ypos_msb : 4; + u8 byte3_res : 4; + u8 byte4_ypos_lsb : 7; + u8 byte4_res : 1; + u8 byte5_speed : 6; + u8 byte5_res : 2; +};
Do not do this. You are relying on the compiler version that you are using to get this right.
drivers/input/touchscreen/dts413.c line 51
Quoted 7 lines
drivers/input/touchscreen/dts413.c new file +7
-0+ +struct dts413 { +struct i2c_client *client; +struct input_dev *input; +struct delayed_work work; +int irq; +};
kerneldoc comments would be nice here.
Quoted 16 lines
drivers/input/touchscreen/dts413.c new file +16
-0+ +static void dts413_poscheck (struct work_struct *work) +{ +struct dts413 *priv =container_of (work, + struct dts413, + work.work); +unsigned short xpos, ypos; +unsigned char event; +u_int8_t buf[6 ]; +struct ts_event *ts = (struct ts_event *)&buf[0 ]; + +memset (buf,0 ,sizeof (buf)); + +/* Now do Page Read */ +if (i2c_master_recv (priv->client, buf,sizeof (buf)) !=sizeof (buf)) { +dev_err (&priv->client->dev,"Unable to read i2c page\n" );
drivers/input/touchscreen/dts413.c line 93
Quoted 10 lines
drivers/input/touchscreen/dts413.c new file +9
-0+ goto out; + } + + xpos = (unsigned short )(ts->byte1_xpos_msb <<7 ) | (ts->byte2_xpos_lsb); + ypos = (unsigned short )(ts->byte3_ypos_msb <<7 ) | (ts->byte4_ypos_lsb); + event = (unsigned char )ts->byte0_stat; +static irqreturn_t dts413_isr (int irq,void *dev_id) +{ +struct dts413 *priv = (struct dts413 *)dev_id;
no need for cast.
drivers/input/touchscreen/dts413.c line 104
Quoted 10 lines
drivers/input/touchscreen/dts413.c new file +10
-0+/* the touch screen controller chip is hooked up to the cpu +* using i2c and a single interrupt line. the interrupt line +* is pulled low whenever someone taps the screen. to deassert +* the interrupt line we need to acknowledge the interrupt by +* communicating with the controller over the slow i2c bus. +* +* we can't acknowledge from interrupt context since the i2c +* bus controller may sleep, so we just disable the interrupt +* here and handle the acknowledge using delayed work. +*/
would have been nice to put this in a proper kerneldoc comment on the start of the function.
drivers/input/touchscreen/dts413.c line 107
Quoted 2 lines
drivers/input/touchscreen/dts413.c new file +2
-0+disable_irq_nosync (irq); +schedule_delayed_work (&priv->work,HZ /100 );
why not just schedule_work?
drivers/input/touchscreen/dts413.c line 115
Quoted 7 lines
drivers/input/touchscreen/dts413.c new file +7
-0+return IRQ_HANDLED ; +} + +static int dts413_open (struct input_dev *dev) +{ +//struct dts413 *priv = input_get_drvdata(dev); +//struct i2c_client *client = priv->client;
// commenting a no-no.
Quoted 78 lines
drivers/input/touchscreen/dts413.c new file +78
-0+/* enable controller */ +//todo + +return 0 ; +} + +static void dts413_close (struct input_dev *dev) +{ +struct dts413 *priv =input_get_drvdata (dev); +//struct i2c_client *client = priv->client; + +disable_irq (priv->irq); + +/* cancel pending work and wait for dts413_poscheck() to finish */ +if (cancel_delayed_work_sync (&priv->work)) { +/* +* if migor_ts_poscheck was canceled we need to enable IRQ +* here to balance disable done in migor_ts_isr. +*/ +enable_irq (priv->irq); + } + +/* disable controller */ +//todo + +enable_irq (priv->irq); +} + + +static int dts413_probe (struct i2c_client *client, +const struct i2c_device_id *idp) +{ +struct dts413 *priv; +struct input_dev *input; +int error; + + priv =kzalloc (sizeof (*priv),GFP_KERNEL ); +if (!priv) { +dev_err (&client->dev,"failed to allocate driver data\n" ); + error = -ENOMEM ; + goto err0; + } + +dev_set_drvdata (&client->dev, priv); + + input =input_allocate_device (); +if (!input) { +dev_err (&client->dev,"Failed to allocate input device.\n" ); + error = -ENOMEM ; + goto err1; + } + + input->evbit[0 ] =BIT_MASK (EV_KEY ) |BIT_MASK (EV_ABS ); + input->keybit[BIT_WORD (BTN_TOUCH )] =BIT_MASK (BTN_TOUCH ); + +input_set_abs_params (input,ABS_X ,0 ,MAX_11BIT ,0 ,0 ); +input_set_abs_params (input,ABS_Y ,0 ,MAX_11BIT ,0 ,0 ); +input_set_abs_params (input,ABS_PRESSURE ,0 ,0 ,0 ,0 ); + + input->name = client->name; + input->id.bustype =BUS_I2C ; + input->dev.parent = &client->dev; + + input->open = dts413_open; + input->close = dts413_close; + +input_set_drvdata (input, priv); + + priv->client = client; + priv->input = input; +INIT_DELAYED_WORK (&priv->work, dts413_poscheck); + priv->irq = client->irq; + + error =input_register_device (input); +if (error) + goto err1; + + error = request_irq(priv->irq, dts413_isr,
Quoted 1 line
IRQF_TRIGGER_FALLING/*IRQF_TRIGGER_LOW*/,
lose the bits you don't want.
Signature · 3 lines
Ben Dooks, Software Engineer, Simtec Electronics http://www.simtec.co.uk/
PATCH 1/1 Touchscreen driver for the DTS413
Hi,
corrected version of the DT413 driver doesn't include bit fields anymore, instead it is using shifting method. Also some comments are added in kernel doc format.
I would like to thank to Ben Dooks for making some suggestions.
DTS413 is capable of so much more than this driver is supporting, thus one can feel free to make upgrades.
Simple DTS413 Touchscreen driver.
(quoted diff) +0 -0
b/drivers/input/touchscreen/Kconfig
index ab02d72..b2403f5 100644
drivers/input/touchscreen/Kconfig +11 -0
@@ -510,6 +510,17 @@ config TOUCHSCREEN_W90X900 To compile this driver as a module, choose M here: the module will be called w90p910_ts. +config TOUCHSCREEN_DTS413 + tristate "DTS413 based touchscreens" + depends on I2C + help + Say Y here if you have a DTS413 based touchscreen. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called dts413. + config TOUCHSCREEN_PCAP tristate "Motorola PCAP touchscreen" depends on EZX_PCAP
(quoted diff) +0 -0
b/drivers/input/touchscreen/Makefile
index 4599bf7..be7315b 100644
drivers/input/touchscreen/Makefile +2 -0
@@ -40,4 +40,6 @@ obj-$(CONFIG_TOUCHSCREEN_WM97XX_ATMEL) += atmel-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE) += zylonite-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_W90X900) += w90p910_ts.o +obj-$(CONFIG_TOUCHSCREEN_DTS413) += dts413.o obj-$(CONFIG_TOUCHSCREEN_PCAP) += pcap_ts.o +
(quoted diff) +0 -0
b/drivers/input/touchscreen/dts413.c
new file mode 100644
index 0000000..ff3be9b
drivers/input/touchscreen/dts413.c new file +198 -0
198 lines not on this page · raw message
IRQF_TRIGGER_FALLING/*IRQF_TRIGGER_LOW*/,
+ client->name, priv);
+ if (error) {
+ dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
+ goto err2;
+ }
+
+ device_init_wakeup(&client->dev, 1);
+ return 0;
+
+ err2:
+ input_unregister_device(input);
+ input = NULL; /* so we dont try to free it below */
+ err1:
+ input_free_device(input);
+ kfree(priv);
+ err0:
+ dev_set_drvdata(&client->dev, NULL);
+ return error;
+}
+
+static int dts413_remove(struct i2c_client *client)
+{
+ struct dts413 *priv = dev_get_drvdata(&client->dev);
+
+ free_irq(priv->irq, priv);
+ input_unregister_device(priv->input);
+ kfree(priv);
+
+ dev_set_drvdata(&client->dev, NULL);
+
+ return 0;
+}
+
+static int dts413_suspend(struct i2c_client *client, pm_message_t mesg) +{
+ struct dts413 *priv = dev_get_drvdata(&client->dev);
+
+ if (device_may_wakeup(&client->dev))
+ enable_irq_wake(priv->irq);
+
+ return 0;
+}
+
+static int dts413_resume(struct i2c_client *client)
+{
+ struct dts413 *priv = dev_get_drvdata(&client->dev);
+
+ if (device_may_wakeup(&client->dev))
+ disable_irq_wake(priv->irq);
+
+ return 0;
+}
+
+static struct i2c_device_id dts413_idtable[] = {
+ { "dts413", 0 },
+ { }
+};
+
+MODULE_DEVICE_TABLE(i2c, dts413_idtable);
+
+static struct i2c_driver dts413_driver = {
+ .driver = {
+ .owner = THIS_MODULE,
+ .name = "dts413"
+ },
+ .id_table = dts413_idtable,
+ .probe = dts413_probe,
+ .remove = __devexit_p(dts413_remove),
+ .suspend = dts413_suspend,
+ .resume = dts413_resume,
+};
+
+static int __init dts413_init(void)
+{
+ return i2c_add_driver(&dts413_driver);
+}
+
+static void __exit dts413_exit(void)
+{
+ i2c_del_driver(&dts413_driver);
+}
+
+module_init(dts413_init);
+module_exit(dts413_exit);
+
+MODULE_AUTHOR("Jernej Turnsek <[email protected]>"); +MODULE_DESCRIPTION("DTS413 Touch Screen Controller driver"); +MODULE_LICENSE("GPL");
PATCH 1/1 Touchscreen driver for the DTS413
---------- Forwarded message ----------
From: Jernej Turnsek <[email protected]>
Date: Tue, Sep 29, 2009 at 2:00 PM
Subject: Re: [PATCH] Touchscreen driver for the DTS413
To: Ben Dooks <[email protected]>
Cc: [email protected], [email protected]
Hi,
corrected version of the DT413 driver doesn't include bit fields anymore, instead it is using shifting method. Also some comments are added in kernel doc format.
I would like to thank to Ben Dooks for making some suggestions.
DTS413 is capable of so much more than this driver is supporting, thus one can feel free to make upgrades.
Simple DTS413 Touchscreen driver.
(quoted diff) +0 -0
b/drivers/input/touchscreen/Kconfig
index ab02d72..b2403f5 100644
drivers/input/touchscreen/Kconfig +0 -0
@@ -510,6 +510,17 @@ config TOUCHSCREEN_W90X900
To compile this driver as a module, choose M here: the module will be called w90p910_ts.
+config TOUCHSCREEN_DTS413
+ tristate "DTS413 based touchscreens"
+ depends on I2C
+ help
+ Say Y here if you have a DTS413 based touchscreen. +
+ If unsure, say N.
+
+ To compile this driver as a module, choose M here: the
+ module will be called dts413.
+
config TOUCHSCREEN_PCAP
tristate "Motorola PCAP touchscreen"
depends on EZX_PCAP
(quoted diff) +0 -0
b/drivers/input/touchscreen/Makefile
index 4599bf7..be7315b 100644
drivers/input/touchscreen/Makefile +0 -0
@@ -40,4 +40,6 @@ obj-$(CONFIG_TOUCHSCREEN_WM97XX_ATMEL) +=
atmel-wm97xx.o
obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE) += zylonite-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_W90X900) += w90p910_ts.o +obj-$(CONFIG_TOUCHSCREEN_DTS413) += dts413.o obj-$(CONFIG_TOUCHSCREEN_PCAP) += pcap_ts.o
+
(quoted diff) +0 -0
b/drivers/input/touchscreen/dts413.c
new file mode 100644
index 0000000..ff3be9b
drivers/input/touchscreen/dts413.c new file +198 -0
198 lines not on this page · raw message
IRQF_TRIGGER_FALLING/*IRQF_TRIGGER_LOW*/,
+ client->name, priv);
+ if (error) {
+ dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
+ goto err2;
+ }
+
+ device_init_wakeup(&client->dev, 1);
+ return 0;
+
+ err2:
+ input_unregister_device(input);
+ input = NULL; /* so we dont try to free it below */
+ err1:
+ input_free_device(input);
+ kfree(priv);
+ err0:
+ dev_set_drvdata(&client->dev, NULL);
+ return error;
+}
+
+static int dts413_remove(struct i2c_client *client)
+{
+ struct dts413 *priv = dev_get_drvdata(&client->dev);
+
+ free_irq(priv->irq, priv);
+ input_unregister_device(priv->input);
+ kfree(priv);
+
+ dev_set_drvdata(&client->dev, NULL);
+
+ return 0;
+}
+
+static int dts413_suspend(struct i2c_client *client, pm_message_t mesg) +{
+ struct dts413 *priv = dev_get_drvdata(&client->dev);
+
+ if (device_may_wakeup(&client->dev))
+ enable_irq_wake(priv->irq);
+
+ return 0;
+}
+
+static int dts413_resume(struct i2c_client *client)
+{
+ struct dts413 *priv = dev_get_drvdata(&client->dev);
+
+ if (device_may_wakeup(&client->dev))
+ disable_irq_wake(priv->irq);
+
+ return 0;
+}
+
+static struct i2c_device_id dts413_idtable[] = {
+ { "dts413", 0 },
+ { }
+};
+
+MODULE_DEVICE_TABLE(i2c, dts413_idtable);
+
+static struct i2c_driver dts413_driver = {
+ .driver = {
+ .owner = THIS_MODULE,
+ .name = "dts413"
+ },
+ .id_table = dts413_idtable,
+ .probe = dts413_probe,
+ .remove = __devexit_p(dts413_remove),
+ .suspend = dts413_suspend,
+ .resume = dts413_resume,
+};
+
+static int __init dts413_init(void)
+{
+ return i2c_add_driver(&dts413_driver);
+}
+
+static void __exit dts413_exit(void)
+{
+ i2c_del_driver(&dts413_driver);
+}
+
+module_init(dts413_init);
+module_exit(dts413_exit);
+
+MODULE_AUTHOR("Jernej Turnsek <[email protected]>"); +MODULE_DESCRIPTION("DTS413 Touch Screen Controller driver"); +MODULE_LICENSE("GPL");
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov
maintainerHi Jernej,
drivers/input/touchscreen/dts413.c line 41
Quoted 10 lines · Jernej Turnsek
drivers/input/touchscreen/dts413.c new file +10
-0+ +/** +* struct dts413 - device structure +* @client: the i2c client, +* @input: the input device, +* @work: workqueue, +* @irq: irq number. +* +* Structure for holding the internal context of a driver. +*/
This is an internal driver structre, it does not form a public interface. I don't see the reason for it to be documented as such. This really applies to all comments in the driver.
Quoted 47 lines
drivers/input/touchscreen/dts413.c new file +47
-0+struct dts413 { + struct i2c_client *client; + struct input_dev *input; + struct work_struct work; + int irq; +}; + +/** +* dts413_poscheck() - function for position checking +* @work: workqueue. +* +* DTS413 report packet: +* MSB LSB +* BYTE1:| 1 | R | R | R | R | R | R | S | +* BYTE2:| 0 | 0 | 0 | 0 |A10| A9| A8| A7| +* BYTE3:| 0 | A6| A5| A4| A3| A2| A1| A0| +* BYTE4:| 0 | 0 | 0 | 0 |B10| B9| B8| B7| +* BYTE5:| 0 | B6| B5| B4| B3| B2| B1| B0| +* BYTE6:| 0 | P6| P5| P4| P3| P2| P1| P0| +* +* S - status +* A10-A0 - 11 bits of 1st direction raw data +* B10-B0 - 11 bits of 2st direction raw data +* P6-P0 - 7 bits of finger pressure +* Please be aware that A nad B just represent 2 resolution directions +* of the touch panel. The reported coordinates are (0~2047,0-2047), +* the bottom left is (0,0). +*/ +static void dts413_poscheck (struct work_struct *work) +{ + struct dts413 *priv = container_of(work, + struct dts413, + work); + unsigned short xpos, ypos; + u_int8_t event, speed; + u_int8_t buf[6]; + + memset(buf, 0, sizeof(buf)); + + /* now do page read */ + if (i2c_master_recv(priv->client, buf, sizeof(buf)) != sizeof(buf)) { + dev_err(&priv->client->dev, "Unable to read i2c page\n"); + goto out; + } + + event = (buf[0] & 0x01) ? 1 : 0; + xpos = (unsigned short)(buf[2] & 0x7f) |
drivers/input/touchscreen/dts413.c line 98
Quoted 10 lines
drivers/input/touchscreen/dts413.c new file +10
-0+ ((unsigned short)(buf[1] & 0x0f) << 7); + ypos = (unsigned short)(buf[4] & 0x7f) | + ((unsigned short)(buf[3] & 0x0f) << 7); + speed = (buf[5] & 0x7f); + + if (event == EVENT_PENDOWN) { + input_report_key(priv->input, BTN_TOUCH, 1); + input_report_abs(priv->input, ABS_X, xpos); + input_report_abs(priv->input, ABS_Y, 2048 - ypos); + input_report_abs(priv->input, ABS_PRESSURE, 1);
The device does not report pressure so don't fake it. BTN_TOUCH is enough.
Quoted 39 lines
+
input_sync(priv->input);
+ } else if (event ==EVENT_PENUP) {
+input_report_key(priv->input, BTN_TOUCH, 0);
+input_report_abs(priv->input, ABS_PRESSURE, 0);
+input_sync(priv->input);
+ }
+ out:
+enable_irq(priv->irq);drivers/input/touchscreen/dts413.c new file +31
-0+} + +/** +* dts413_isr() - interrupt service routine +* @irg: irq number. +* @dev_id: dts413 device. +* +* The touch screen controller chip is hooked up to the cpu +* using i2c and a single interrupt line. The interrupt line +* is pulled low whenever someone taps the screen. To deassert +* the interrupt line we need to acknowledge the interrupt by +* communicating with the controller over the slow i2c bus. +* +* We can't acknowledge from interrupt context since the i2c +* bus controller may sleep, so we just disable the interrupt +* here and handle the acknowledge using delayed work. +*/ +static irqreturn_t dts413_isr (int irq,void *dev_id) +{ + struct dts413 *priv = dev_id; + + disable_irq_nosync(irq); + schedule_work(&priv->work); + + return IRQ_HANDLED; +} + +static int dts413_open (struct input_dev *dev) +{ + return 0; +}
drivers/input/touchscreen/dts413.c line 147
Quoted 10 lines
drivers/input/touchscreen/dts413.c new file +10
-0+ +static void dts413_close (struct input_dev *dev) +{ + struct dts413 *priv = input_get_drvdata(dev); + + disable_irq(priv->irq); + + cancel_work_sync(&priv->work); + + enable_irq(priv->irq);
No, you can't do this. Unlike migor_ts driver that actually turns off the controller there is nothing that prevents the device to generate more interrupts (and schedule more work) after "closing" the device. This means that there is a chance that there is still work scheduled after you unregister device and free memory in remove(). This code must go there.
drivers/input/touchscreen/dts413.c line 151
Quoted 4 lines
drivers/input/touchscreen/dts413.c new file +4
-0+} + +static int dts413_probe (struct i2c_client *client, + const struct i2c_device_id *idp)
__devinit
Quoted 17 lines
drivers/input/touchscreen/dts413.c new file +17
-0+{ + struct dts413 *priv; + struct input_dev *input; + int error; + + priv = kzalloc(sizeof(*priv), GFP_KERNEL); + if (!priv) { + dev_err(&client->dev, "failed to allocate driver data\n"); + error = -ENOMEM; + goto err0; + } + + dev_set_drvdata(&client->dev, priv); + + input = input_allocate_device(); + if (!input) { + dev_err(&client->dev, "Failed to allocate input device.\n");
drivers/input/touchscreen/dts413.c line 178
Quoted 10 lines
drivers/input/touchscreen/dts413.c new file +10
-0+ error = -ENOMEM; + goto err1; + } + + input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); + input->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); + + input_set_abs_params(input, ABS_X, 0, MAX_11BIT, 0, 0); + input_set_abs_params(input, ABS_Y, 0, MAX_11BIT, 0, 0); + input_set_abs_params(input, ABS_PRESSURE, 0, 0, 0, 0);
No pressure.
Quoted 32 lines
drivers/input/touchscreen/dts413.c new file +20
-0+ + input->name = client->name; + input->id.bustype = BUS_I2C; + input->dev.parent = &client->dev; + + input->open = dts413_open; + input->close = dts413_close; + + input_set_drvdata(input, priv); + + priv->client = client; + priv->input = input; + INIT_WORK(&priv->work, dts413_poscheck); + priv->irq = client->irq; + + error = input_register_device(input); + if (error) + goto err1; + + error = request_irq(priv->irq, dts413_isr,IRQF_TRIGGER_FALLING/*IRQF_TRIGGER_LOW*/,
+client->name, priv);
+ if (error) {
+dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
+ goto err2;
+ }(quoted diff) +6
-0+ + device_init_wakeup(&client->dev, 1); + return 0; + + err2: + input_unregister_device(input);
Review
Quoted 10 lines
(quoted diff) +10
-0+ input = NULL; /* so we dont try to free it below */ + err1: + input_free_device(input); + kfree(priv); + err0: + dev_set_drvdata(&client->dev, NULL); + return error; +} + +static int dts413_remove(struct i2c_client *client)
__devexit.
Quoted 71 lines
(quoted diff) +67
-1+{ + struct dts413 *priv = dev_get_drvdata(&client->dev); + + free_irq(priv->irq, priv); + input_unregister_device(priv->input); + kfree(priv); + + dev_set_drvdata(&client->dev, NULL); + + return 0; +} + +static int dts413_suspend(struct i2c_client *client, pm_message_t mesg) +{ + struct dts413 *priv = dev_get_drvdata(&client->dev); + + if (device_may_wakeup(&client->dev)) + enable_irq_wake(priv->irq); + + return 0; +} + +static int dts413_resume(struct i2c_client *client) +{ + struct dts413 *priv = dev_get_drvdata(&client->dev); + + if (device_may_wakeup(&client->dev)) + disable_irq_wake(priv->irq); + + return 0; +} + +static struct i2c_device_id dts413_idtable[] = { + { "dts413", 0 }, + { } +}; + +MODULE_DEVICE_TABLE(i2c, dts413_idtable); + +static struct i2c_driver dts413_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "dts413" + }, + .id_table = dts413_idtable, + .probe = dts413_probe, + .remove = __devexit_p(dts413_remove), + .suspend = dts413_suspend, + .resume = dts413_resume, +}; + +static int __init dts413_init(void) +{ + return i2c_add_driver(&dts413_driver); +} + +static void __exit dts413_exit(void) +{ + i2c_del_driver(&dts413_driver); +} + +module_init(dts413_init); +module_exit(dts413_exit); + +MODULE_AUTHOR("Jernej Turnsek <[email protected]>"); +MODULE_DESCRIPTION("DTS413 Touch Screen Controller driver"); +MODULE_LICENSE("GPL"); --To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi,
I would like to thank you for taking time to review DTS413 driver, but I am a little bit confused here. Regarding the comments I just followed a Ben Dooks suggestions, but I agree that internal functions shouldn't be commented in kernel doc style. Other thing is ABS_PRESSURE reporting. At first I thought that this is not neccessary, but when using driver with the Kdrive tiny X server (Xfbdev), it won't work. Xfbdev gives me Segmentation Fault.
BR,
Jernej
Quoted 285 lines · Dmitry Torokhov
Hi Jernej,
drivers/input/touchscreen/dts413.c line 41
Quoted 10 lines · Jernej Turnsek
drivers/input/touchscreen/dts413.c new file +10
-0+ +/** +* struct dts413 - device structure +* @client: the i2c client, +* @input: the input device, +* @work: workqueue, +* @irq: irq number. +* +* Structure for holding the internal context of a driver. +*/ This is an internal driver structre, it does not form a public interface. I don't see the reason for it to be documented as such. This really applies to all comments in the driver.
Quoted 47 lines
drivers/input/touchscreen/dts413.c new file +47
-0+struct dts413 { + struct i2c_client *client; + struct input_dev *input; + struct work_struct work; + int irq; +}; + +/** +* dts413_poscheck() - function for position checking +* @work: workqueue. +* +* DTS413 report packet: +* MSB LSB +* BYTE1:| 1 | R | R | R | R | R | R | S | +* BYTE2:| 0 | 0 | 0 | 0 |A10| A9| A8| A7| +* BYTE3:| 0 | A6| A5| A4| A3| A2| A1| A0| +* BYTE4:| 0 | 0 | 0 | 0 |B10| B9| B8| B7| +* BYTE5:| 0 | B6| B5| B4| B3| B2| B1| B0| +* BYTE6:| 0 | P6| P5| P4| P3| P2| P1| P0| +* +* S - status +* A10-A0 - 11 bits of 1st direction raw data +* B10-B0 - 11 bits of 2st direction raw data +* P6-P0 - 7 bits of finger pressure +* Please be aware that A nad B just represent 2 resolution directions +* of the touch panel. The reported coordinates are (0~2047,0-2047), +* the bottom left is (0,0). +*/ +static void dts413_poscheck (struct work_struct *work) +{ + struct dts413 *priv = container_of(work, + struct dts413, + work); + unsigned short xpos, ypos; + u_int8_t event, speed; + u_int8_t buf[6]; + + memset(buf, 0, sizeof(buf)); + + /* now do page read */ + if (i2c_master_recv(priv->client, buf, sizeof(buf)) != sizeof(buf)) { + dev_err(&priv->client->dev, "Unable to read i2c page\n"); + goto out; + } + + event = (buf[0] & 0x01) ? 1 : 0; + xpos = (unsigned short)(buf[2] & 0x7f) |drivers/input/touchscreen/dts413.c line 98
Quoted 10 lines
drivers/input/touchscreen/dts413.c new file +10
-0+ ((unsigned short)(buf[1] & 0x0f) << 7); + ypos = (unsigned short)(buf[4] & 0x7f) | + ((unsigned short)(buf[3] & 0x0f) << 7); + speed = (buf[5] & 0x7f); + + if (event == EVENT_PENDOWN) { + input_report_key(priv->input, BTN_TOUCH, 1); + input_report_abs(priv->input, ABS_X, xpos); + input_report_abs(priv->input, ABS_Y, 2048 - ypos); + input_report_abs(priv->input, ABS_PRESSURE, 1);The device does not report pressure so don't fake it.
BTN_TOUCHis enough.Quoted 39 lines
+
input_sync(priv->input);
+ } else if (event ==EVENT_PENUP) {
+input_report_key(priv->input, BTN_TOUCH, 0);
+input_report_abs(priv->input, ABS_PRESSURE, 0);
+input_sync(priv->input);
+ }
+ out:
+enable_irq(priv->irq);drivers/input/touchscreen/dts413.c new file +31
-0+} + +/** +* dts413_isr() - interrupt service routine +* @irg: irq number. +* @dev_id: dts413 device. +* +* The touch screen controller chip is hooked up to the cpu +* using i2c and a single interrupt line. The interrupt line +* is pulled low whenever someone taps the screen. To deassert +* the interrupt line we need to acknowledge the interrupt by +* communicating with the controller over the slow i2c bus. +* +* We can't acknowledge from interrupt context since the i2c +* bus controller may sleep, so we just disable the interrupt +* here and handle the acknowledge using delayed work. +*/ +static irqreturn_t dts413_isr (int irq,void *dev_id) +{ + struct dts413 *priv = dev_id; + + disable_irq_nosync(irq); + schedule_work(&priv->work); + + return IRQ_HANDLED; +} + +static int dts413_open (struct input_dev *dev) +{ + return 0; +}drivers/input/touchscreen/dts413.c line 147
Quoted 10 lines
drivers/input/touchscreen/dts413.c new file +10
-0+ +static void dts413_close (struct input_dev *dev) +{ + struct dts413 *priv = input_get_drvdata(dev); + + disable_irq(priv->irq); + + cancel_work_sync(&priv->work); + + enable_irq(priv->irq);No, you can't do this. Unlike
migor_tsdriver that actually turns off the controller there is nothing that prevents the device to generate more interrupts (and schedule more work) after "closing" the device. This means that there is a chance that there is still work scheduled after you unregister device and free memory inremove(). This code must go there.drivers/input/touchscreen/dts413.c line 151
Quoted 4 lines
drivers/input/touchscreen/dts413.c new file +4
-0+} + +static int dts413_probe (struct i2c_client *client, + const struct i2c_device_id *idp)
__devinitQuoted 17 lines
drivers/input/touchscreen/dts413.c new file +17
-0+{ + struct dts413 *priv; + struct input_dev *input; + int error; + + priv = kzalloc(sizeof(*priv), GFP_KERNEL); + if (!priv) { + dev_err(&client->dev, "failed to allocate driver data\n"); + error = -ENOMEM; + goto err0; + } + + dev_set_drvdata(&client->dev, priv); + + input = input_allocate_device(); + if (!input) { + dev_err(&client->dev, "Failed to allocate input device.\n");drivers/input/touchscreen/dts413.c line 178
Quoted 10 lines
drivers/input/touchscreen/dts413.c new file +10
-0+ error = -ENOMEM; + goto err1; + } + + input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); + input->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); + + input_set_abs_params(input, ABS_X, 0, MAX_11BIT, 0, 0); + input_set_abs_params(input, ABS_Y, 0, MAX_11BIT, 0, 0); + input_set_abs_params(input, ABS_PRESSURE, 0, 0, 0, 0);No pressure.
Quoted 32 lines
drivers/input/touchscreen/dts413.c new file +20
-0+ + input->name = client->name; + input->id.bustype = BUS_I2C; + input->dev.parent = &client->dev; + + input->open = dts413_open; + input->close = dts413_close; + + input_set_drvdata(input, priv); + + priv->client = client; + priv->input = input; + INIT_WORK(&priv->work, dts413_poscheck); + priv->irq = client->irq; + + error = input_register_device(input); + if (error) + goto err1; + + error = request_irq(priv->irq, dts413_isr,IRQF_TRIGGER_FALLING/*IRQF_TRIGGER_LOW*/,
+client->name, priv);
+ if (error) {
+dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
+ goto err2;
+ }(quoted diff) +6
-0+ + device_init_wakeup(&client->dev, 1); + return 0; + + err2: + input_unregister_device(input);Review
Quoted 10 lines
(quoted diff) +10
-0+ input = NULL; /* so we dont try to free it below */ + err1: + input_free_device(input); + kfree(priv); + err0: + dev_set_drvdata(&client->dev, NULL); + return error; +} + +static int dts413_remove(struct i2c_client *client)
__devexit.Quoted 66 lines
(quoted diff) +66
-0+{ + struct dts413 *priv = dev_get_drvdata(&client->dev); + + free_irq(priv->irq, priv); + input_unregister_device(priv->input); + kfree(priv); + + dev_set_drvdata(&client->dev, NULL); + + return 0; +} + +static int dts413_suspend(struct i2c_client *client, pm_message_t mesg) +{ + struct dts413 *priv = dev_get_drvdata(&client->dev); + + if (device_may_wakeup(&client->dev)) + enable_irq_wake(priv->irq); + + return 0; +} + +static int dts413_resume(struct i2c_client *client) +{ + struct dts413 *priv = dev_get_drvdata(&client->dev); + + if (device_may_wakeup(&client->dev)) + disable_irq_wake(priv->irq); + + return 0; +} + +static struct i2c_device_id dts413_idtable[] = { + { "dts413", 0 }, + { } +}; + +MODULE_DEVICE_TABLE(i2c, dts413_idtable); + +static struct i2c_driver dts413_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "dts413" + }, + .id_table = dts413_idtable, + .probe = dts413_probe, + .remove = __devexit_p(dts413_remove), + .suspend = dts413_suspend, + .resume = dts413_resume, +}; + +static int __init dts413_init(void) +{ + return i2c_add_driver(&dts413_driver); +} + +static void __exit dts413_exit(void) +{ + i2c_del_driver(&dts413_driver); +} + +module_init(dts413_init); +module_exit(dts413_exit); + +MODULE_AUTHOR("Jernej Turnsek <[email protected]>"); +MODULE_DESCRIPTION("DTS413 Touch Screen Controller driver");
Quoted 9 lines
Quoted 5 lines
+MODULE_LICENSE("GPL");
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov
maintainerQuoted 9 lines · Jernej Turnsek
Hi,
I would like to thank you for taking time to review DTS413 driver, but I am a little bit confused here. Regarding the comments I just followed a Ben Dooks suggestions, but I agree that internal functions shouldn't be commented in kernel doc style. Other thing is
ABS_PRESSUREreporting. At first I thought that this is not neccessary, but when using driver with the Kdrive tiny X server (Xfbdev), it won't work. Xfbdev gives me Segmentation Fault.
That would be the issue with Xfbdev. There are plentry of touchscreen driers in the kernel that do not report pressure.
Signature · 1 line
Dmitry