input: add driver for EETI touchpanels [v4]
Subsystems (2)
PATCH 1/1 input: add driver for EETI touchpanels [v4]
This patch adds a driver for EETI's I2C connected touchscreens.
---
New version with Dmitry's comments considered:
- use work_struct instead of delayed_work
- use proper exit path in eeti_ts_read()
- always report pressure if we have it
- devinit/devexit cleanups
drivers/input/touchscreen/Kconfig | 9 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/eeti_ts.c | 290 +++++++++++++++++++++++++++++++++++ 3 files changed, 300 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/eeti_ts.c
drivers/input/touchscreen/Kconfig +9 -0
@@ -111,6 +111,15 @@ config TOUCHSCREEN_DA9034 Say Y here to enable the support for the touchscreen found on Dialog Semiconductor DA9034 PMIC. +config TOUCHSCREEN_EETI + tristate "EETI touchscreen panel support" + depends on I2C + help + Say Y here to enable support for I2C connected EETI touch panels. + + To compile this driver as a module, choose M here: the + module will be called eeti_ts. + config TOUCHSCREEN_FUJITSU tristate "Fujitsu serial touchscreen" select SERIO
drivers/input/touchscreen/Makefile +1 -0
@@ -13,6 +13,7 @@ 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_GUNZE) += gunze.o +obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o
drivers/input/touchscreen/eeti_ts.c new file +290 -0
290 lines not on this page · raw message
Signature · 1 line
1.6.2.1
Hallo Daniel,
Quoted 160 lines · Daniel Mack
This patch adds a driver for EETI's I2C connected touchscreens.
Signed-off-by Daniel Mack <[email protected]>Tested-by Sven Neumann <[email protected]>Cc Jean Delvare <[email protected]>---
New version with Dmitry's comments considered:
- usework_structinstead ofdelayed_work
- use proper exit path ineeti_ts_read()
- always report pressure if we have it
- devinit/devexit cleanupsdrivers/input/touchscreen/Kconfig | 9 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/eeti_ts.c | 290 +++++++++++++++++++++++++++++++++++ 3 files changed, 300 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/eeti_ts.c(...)
drivers/input/touchscreen/eeti_ts.c new file +138
-0@@ -0,0 +1,290 @@ +/* +* Touch Screen driver for EETI's I2C connected touch screen panels +* Copyright (c) 2009 Daniel Mack <[email protected]> +* +* See EETI's software guide for the protocol specification: +* http://home.eeti.com.tw/web20/eg/guide.htm +* +* Based on migor_ts.c +* Copyright (c) 2008 Magnus Damm +* Copyright (c) 2007 Ujjwal Pande <[email protected]> +* +* This file is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License as published by the Free Software Foundation; either +* version 2 of the License, or (at your option) any later version. +* +* This file is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/kernel.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <linux/i2c.h> +#include <linux/timer.h> +#include <linux/gpio.h> + +static int flip_x; +module_param (flip_x, bool,0644 ); +MODULE_PARM_DESC (flip_x,"flip x coordinate" ); + +static int flip_y; +module_param (flip_y, bool,0644 ); +MODULE_PARM_DESC (flip_y,"flip y coordinate" ); + +struct eeti_ts_priv { +struct i2c_client *client; +struct input_dev *input; +struct work_struct work; +struct mutex mutex; +int irq; +}; + +#define EETI_TS_BITDEPTH (11) +#define EETI_MAXVAL ((1 << (EETI_TS_BITDEPTH + 1)) - 1) + +#define REPORT_BIT_PRESSED (1 << 0) +#define REPORT_BIT_AD0 (1 << 1) +#define REPORT_BIT_AD1 (1 << 2) +#define REPORT_BIT_HAS_PRESSURE (1 << 6) +#define REPORT_RES_BITS (v) (((v) >> 1) + EETI_TS_BITDEPTH) + +static void eeti_ts_read (struct work_struct *work) +{ +char buf[6 ]; +unsigned int x, y, res, pressed, to =100 ; +struct eeti_ts_priv *priv = + container_of(work, struct eeti_ts_priv, work); + +mutex_lock (&priv->mutex); + +while (!gpio_get_value (irq_to_gpio (priv->irq)) && --to) +i2c_master_recv (priv->client, buf,sizeof (buf)); + +if (!to) { +dev_err (&priv->client->dev, +"unable to clear IRQ - line stuck?\n" ); + goto out; + } + +/* drop non-report packets */ +if (!(buf[0 ] &0x80 )) + goto out; + + pressed = buf[0 ] &REPORT_BIT_PRESSED ; + res =REPORT_RES_BITS (buf[0 ] & (REPORT_BIT_AD0 |REPORT_BIT_AD1 )); + x = buf[2 ] | (buf[1 ] <<8 ); + y = buf[4 ] | (buf[3 ] <<8 ); + +/* fix the range to 11 bits */ + x >>= res -EETI_TS_BITDEPTH ; + y >>= res -EETI_TS_BITDEPTH ; + +if (flip_x) + x =EETI_MAXVAL - x; + +if (flip_y) + y =EETI_MAXVAL - y; + +if (buf[0 ] &REPORT_BIT_HAS_PRESSURE ) +input_report_abs (priv->input,ABS_PRESSURE , buf[5 ]); + +input_report_abs (priv->input,ABS_X , x); +input_report_abs (priv->input,ABS_Y , y); +input_report_key (priv->input,BTN_TOUCH , !!pressed); +input_sync (priv->input); + +out: +mutex_unlock (&priv->mutex); +} + +static irqreturn_t eeti_ts_isr (int irq,void *dev_id) +{ +struct eeti_ts_priv *priv = dev_id; + +/* postpone I2C transactions as we are atomic */ +schedule_work (&priv->work); + +return IRQ_HANDLED ; +} + +static int eeti_ts_open (struct input_dev *dev) +{ +struct eeti_ts_priv *priv =input_get_drvdata (dev); + +enable_irq (priv->irq); + +/* Read the events once to arm the IRQ */ +eeti_ts_read (&priv->work); + +return 0 ; +} + +static void eeti_ts_close (struct input_dev *dev) +{ +struct eeti_ts_priv *priv =input_get_drvdata (dev); + +disable_irq (priv->irq); +cancel_work_sync (&priv->work); +}
drivers/input/touchscreen/eeti_ts.c line 148
Quoted 10 lines
drivers/input/touchscreen/eeti_ts.c new file +10
-0+ +static int __devinit eeti_ts_probe (struct i2c_client *client, +const struct i2c_device_id *idp) +{ +struct i2c_adapter *adapter =to_i2c_adapter (client->dev.parent); +struct eeti_ts_priv *priv; +struct input_dev *input; +int err = -ENOMEM ; + +if (!i2c_check_functionality (adapter,I2C_FUNC_SMBUS_BYTE ))
This functionality does not correspond to the I2C access method your code uses. You must check for I2C_FUNC_I2C instead (if you want to check at all - it's essentially optional with the new binding model.)
drivers/input/touchscreen/eeti_ts.c line 149
Quoted 1 line
drivers/input/touchscreen/eeti_ts.c new file +1
-0+return -EIO ;
And this isn't an I/O error.
Quoted 29 lines
drivers/input/touchscreen/eeti_ts.c new file +29
-0+ +/* In contrast to what's described in the datasheet, there seems +* to be no way of probing the presence of that device using I2C +* commands. So we need to blindly believe it is there, and wait +* for interrupts to occur. */ + + priv =kzalloc (sizeof (*priv),GFP_KERNEL ); +if (!priv) { +dev_err (&client->dev,"failed to allocate driver data\n" ); + goto err0; + } + +mutex_init (&priv->mutex); + input =input_allocate_device (); + +if (!input) { +dev_err (&client->dev,"Failed to allocate input device.\n" ); + 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 ,EETI_MAXVAL ,0 ,0 ); +input_set_abs_params (input,ABS_Y ,0 ,EETI_MAXVAL ,0 ,0 ); +input_set_abs_params (input,ABS_PRESSURE ,0 ,0xff ,0 ,0 ); + + input->name = client->name; + input->id.bustype =BUS_I2C ;
drivers/input/touchscreen/eeti_ts.c line 188
Quoted 10 lines
drivers/input/touchscreen/eeti_ts.c new file +10
-0+ input->dev.parent = &client->dev; + input->open = eeti_ts_open; + input->close = eeti_ts_close; + + priv->client = client; + priv->input = input; + priv->irq = client->irq; + +INIT_WORK (&priv->work, eeti_ts_read); +dev_set_drvdata (&client->dev, priv);
We have i2c_set_clientdata().
Quoted 18 lines
drivers/input/touchscreen/eeti_ts.c new file +18
-0+input_set_drvdata (input, priv); + + err =input_register_device (input); +if (err) + goto err1; + + err =request_irq (priv->irq, eeti_ts_isr,IRQF_TRIGGER_FALLING , + client->name, priv); +if (err) { +dev_err (&client->dev,"Unable to request touchscreen IRQ.\n" ); + goto err2; + } + +/* Disable the irq for now. It will be enabled once the input device +* is opened. */ +disable_irq (priv->irq); + +device_init_wakeup (&client->dev,0 );
drivers/input/touchscreen/eeti_ts.c line 216
Quoted 10 lines
drivers/input/touchscreen/eeti_ts.c new file +10
-0+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 );
Should be 2 lines above, before kfree(priv).
drivers/input/touchscreen/eeti_ts.c line 222
Quoted 6 lines
drivers/input/touchscreen/eeti_ts.c new file +6
-0+return err; +} + +static int __devexit eeti_ts_remove(struct i2c_client *client) +{ +struct eeti_ts_priv *priv =dev_get_drvdata (&client->dev);
We have i2c_get_clientdata().
drivers/input/touchscreen/eeti_ts.c line 230
Quoted 8 lines
drivers/input/touchscreen/eeti_ts.c new file +8
-0+ +free_irq (priv->irq, priv); +input_unregister_device (priv->input); +dev_set_drvdata (&client->dev,NULL ); +kfree (priv); + +return 0 ; +}
The rest of the I2C code looks OK.
Signature · 1 line
Jean Delvare
Hi Jean,
thanks for your input.
Quoted 10 lines · Jean Delvare
drivers/input/touchscreen/eeti_ts.c line 148
Quoted 6 lines
drivers/input/touchscreen/eeti_ts.c new file +6
-0+struct i2c_adapter *adapter =to_i2c_adapter (client->dev.parent); +struct eeti_ts_priv *priv; +struct input_dev *input; +int err = -ENOMEM ; + +if (!i2c_check_functionality (adapter,I2C_FUNC_SMBUS_BYTE ))This functionality does not correspond to the I2C access method your code uses. You must check for
I2C_FUNC_I2Cinstead (if you want to check at all - it's essentially optional with the new binding model.)
Yes, I though so too and removed the check for now. New version coming up.
Thanks,
Daniel
PATCH 1/1 input: add driver for EETI touchpanels [v5]
This patch adds a driver for EETI's I2C connected touchscreens.
--- drivers/input/touchscreen/Kconfig | 9 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/eeti_ts.c | 286 +++++++++++++++++++++++++++++++++++ 3 files changed, 296 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/eeti_ts.c
drivers/input/touchscreen/Kconfig +9 -0
@@ -111,6 +111,15 @@ config TOUCHSCREEN_DA9034 Say Y here to enable the support for the touchscreen found on Dialog Semiconductor DA9034 PMIC. +config TOUCHSCREEN_EETI + tristate "EETI touchscreen panel support" + depends on I2C + help + Say Y here to enable support for I2C connected EETI touch panels. + + To compile this driver as a module, choose M here: the + module will be called eeti_ts. + config TOUCHSCREEN_FUJITSU tristate "Fujitsu serial touchscreen" select SERIO
drivers/input/touchscreen/Makefile +1 -0
@@ -13,6 +13,7 @@ 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_GUNZE) += gunze.o +obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o
drivers/input/touchscreen/eeti_ts.c new file +286 -0
286 lines not on this page · raw message
Signature · 1 line
1.6.2.1
Re: [PATCH] input: add driver for EETI touchpanels [v5]
Quoted 11 lines · Daniel Mack
This patch adds a driver for EETI's I2C connected touchscreens.
Signed-off-by Daniel Mack <[email protected]>Tested-by Sven Neumann <[email protected]>Cc Jean Delvare <[email protected]>--- drivers/input/touchscreen/Kconfig | 9 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/eeti_ts.c | 286 +++++++++++++++++++++++++++++++++++ 3 files changed, 296 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/eeti_ts.c
For the i2c part:
Signature · 1 line
Jean Delvare
Re: [PATCH] input: add driver for EETI touchpanels [v5]
Quoted 13 lines · Jean Delvare
Quoted 11 lines · Daniel Mack
This patch adds a driver for EETI's I2C connected touchscreens.
Signed-off-by Daniel Mack <[email protected]>Tested-by Sven Neumann <[email protected]>Cc Jean Delvare <[email protected]>--- drivers/input/touchscreen/Kconfig | 9 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/eeti_ts.c | 286 +++++++++++++++++++++++++++++++++++ 3 files changed, 296 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/eeti_ts.c
Quoted 2 lines
For the i2c part:
Acked-by Jean Delvare <[email protected]>
Thanks!
Dmitry, any more thoughts about that, or is it ready for your tree?
Daniel
Re: [PATCH] input: add driver for EETI touchpanels [v5]
Quoted 14 lines · Daniel Mack
Quoted 13 lines · Jean Delvare
Quoted 11 lines · Daniel Mack
This patch adds a driver for EETI's I2C connected touchscreens.
Signed-off-by Daniel Mack <[email protected]>Tested-by Sven Neumann <[email protected]>Cc Jean Delvare <[email protected]>--- drivers/input/touchscreen/Kconfig | 9 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/eeti_ts.c | 286 +++++++++++++++++++++++++++++++++++ 3 files changed, 296 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/eeti_ts.c
Quoted 7 lines
Quoted 2 lines
For the i2c part:
Acked-by Jean Delvare <[email protected]>Thanks!
Dmitry, any more thoughts about that, or is it ready for your tree?
Applied to the 'next' branch, thank you Daniel.
Signature · 1 line
Dmitry