5 files changed, 990 insertions, 0 deletions

diff --git a/Documentation/input/edt-ft5x06.txt b/Documentation/input/edt-ft5x06.txt
new file mode 100644
index 00000000000..2032f0b7a8f
--- /dev/null
+++ b/Documentation/input/edt-ft5x06.txt
@@ -0,0 +1,54 @@
+EDT ft5x06 based Polytouch devices
+----------------------------------
+
+The edt-ft5x06 driver is useful for the EDT "Polytouch" family of capacitive
+touch screens. Note that it is *not* suitable for other devices based on the
+focaltec ft5x06 devices, since they contain vendor-specific firmware. In
+particular this driver is not suitable for the Nook tablet.
+
+It has been tested with the following devices:
+  * EP0350M06
+  * EP0430M06
+  * EP0570M06
+  * EP0700M06
+
+The driver allows configuration of the touch screen via a set of sysfs files:
+
+/sys/class/input/eventX/device/device/threshold:
+    allows setting the "click"-threshold in the range from 20 to 80.
+
+/sys/class/input/eventX/device/device/gain:
+    allows setting the sensitivity in the range from 0 to 31. Note that
+    lower values indicate higher sensitivity.
+
+/sys/class/input/eventX/device/device/offset:
+    allows setting the edge compensation in the range from 0 to 31.
+
+/sys/class/input/eventX/device/device/report_rate:
+    allows setting the report rate in the range from 3 to 14.
+
+
+For debugging purposes the driver provides a few files in the debug
+filesystem (if available in the kernel). In /sys/kernel/debug/edt_ft5x06
+you'll find the following files:
+
+num_x, num_y:
+    (readonly) contains the number of sensor fields in X- and
+    Y-direction.
+
+mode:
+    allows switching the sensor between "factory mode" and "operation
+    mode" by writing "1" or "0" to it. In factory mode (1) it is
+    possible to get the raw data from the sensor. Note that in factory
+    mode regular events don't get delivered and the options described
+    above are unavailable.
+
+raw_data:
+    contains num_x * num_y big endian 16 bit values describing the raw
+    values for each sensor field. Note that each read() call on this
+    files triggers a new readout. It is recommended to provide a buffer
+    big enough to contain num_x * num_y * 2 bytes.
+
+Note that reading raw_data gives a I/O error when the device is not in factory
+mode. The same happens when reading/writing to the parameter files when the
+device is not in regular operation mode.
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 73bd2f6b82e..1ba232cbc09 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -472,6 +472,19 @@ config TOUCHSCREEN_PENMOUNT
           To compile this driver as a module, choose M here: the
           module will be called penmount.
 
+config TOUCHSCREEN_EDT_FT5X06
+        tristate "EDT FocalTech FT5x06 I2C Touchscreen support"
+        depends on I2C
+        help
+          Say Y here if you have an EDT "Polytouch" touchscreen based
+          on the FocalTech FT5x06 family of controllers connected to
+          your system.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called edt-ft5x06.
+
 config TOUCHSCREEN_MIGOR
         tristate "Renesas MIGO-R touchscreen"
         depends on SH_MIGOR && I2C
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 5920c60f999..178eb128d90 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_TOUCHSCREEN_CYTTSP_SPI)	+= cyttsp_spi.o
 obj-$(CONFIG_TOUCHSCREEN_DA9034)        += da9034-ts.o
 obj-$(CONFIG_TOUCHSCREEN_DA9052)        += da9052_tsi.o
 obj-$(CONFIG_TOUCHSCREEN_DYNAPRO)       += dynapro.o
+obj-$(CONFIG_TOUCHSCREEN_EDT_FT5X06)    += edt-ft5x06.o
 obj-$(CONFIG_TOUCHSCREEN_HAMPSHIRE)     += hampshire.o
 obj-$(CONFIG_TOUCHSCREEN_GUNZE)         += gunze.o
 obj-$(CONFIG_TOUCHSCREEN_EETI)          += eeti_ts.o
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
new file mode 100644
index 00000000000..9afc777a40a
--- /dev/null
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -0,0 +1,898 @@
+/*
+ * Copyright (C) 2012 Simon Budig, <simon.budig@kernelconcepts.de>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program 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
+ */
+
+/*
+ * This is a driver for the EDT "Polytouch" family of touch controllers
+ * based on the FocalTech FT5x06 line of chips.
+ *
+ * Development of this driver has been sponsored by Glyn:
+ *    http://www.glyn.com/Products/Displays
+ */
+
+#include <linux/module.h>
+#include <linux/ratelimit.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/i2c.h>
+#include <linux/uaccess.h>
+#include <linux/delay.h>
+#include <linux/debugfs.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/input/mt.h>
+#include <linux/input/edt-ft5x06.h>
+
+#define MAX_SUPPORT_POINTS              5
+
+#define WORK_REGISTER_THRESHOLD         0x00
+#define WORK_REGISTER_REPORT_RATE       0x08
+#define WORK_REGISTER_GAIN              0x30
+#define WORK_REGISTER_OFFSET            0x31
+#define WORK_REGISTER_NUM_X             0x33
+#define WORK_REGISTER_NUM_Y             0x34
+
+#define WORK_REGISTER_OPMODE            0x3c
+#define FACTORY_REGISTER_OPMODE         0x01
+
+#define TOUCH_EVENT_DOWN                0x00
+#define TOUCH_EVENT_UP                  0x01
+#define TOUCH_EVENT_ON                  0x02
+#define TOUCH_EVENT_RESERVED            0x03
+
+#define EDT_NAME_LEN                    23
+#define EDT_SWITCH_MODE_RETRIES         10
+#define EDT_SWITCH_MODE_DELAY           5 /* msec */
+#define EDT_RAW_DATA_RETRIES            100
+#define EDT_RAW_DATA_DELAY              1 /* msec */
+
+struct edt_ft5x06_ts_data {
+        struct i2c_client *client;
+        struct input_dev *input;
+        u16 num_x;
+        u16 num_y;
+
+#if defined(CONFIG_DEBUG_FS)
+        struct dentry *debug_dir;
+        u8 *raw_buffer;
+        size_t raw_bufsize;
+#endif
+
+        struct mutex mutex;
+        bool factory_mode;
+        int threshold;
+        int gain;
+        int offset;
+        int report_rate;
+
+        char name[EDT_NAME_LEN];
+};
+
+static int edt_ft5x06_ts_readwrite(struct i2c_client *client,
+                                   u16 wr_len, u8 *wr_buf,
+                                   u16 rd_len, u8 *rd_buf)
+{
+        struct i2c_msg wrmsg[2];
+        int i = 0;
+        int ret;
+
+        if (wr_len) {
+                wrmsg[i].addr  = client->addr;
+                wrmsg[i].flags = 0;
+                wrmsg[i].len = wr_len;
+                wrmsg[i].buf = wr_buf;
+                i++;
+        }
+        if (rd_len) {
+                wrmsg[i].addr  = client->addr;
+                wrmsg[i].flags = I2C_M_RD;
+                wrmsg[i].len = rd_len;
+                wrmsg[i].buf = rd_buf;
+                i++;
+        }
+
+        ret = i2c_transfer(client->adapter, wrmsg, i);
+        if (ret < 0)
+                return ret;
+        if (ret != i)
+                return -EIO;