4 files changed, 1317 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/input/elants_i2c.txt b/Documentation/devicetree/bindings/input/elants_i2c.txt
new file mode 100644
index 000000000000..a765232e6446
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/elants_i2c.txt
@@ -0,0 +1,33 @@
+Elantech I2C Touchscreen
+
+Required properties:
+- compatible: must be "elan,ekth3500".
+- reg: I2C address of the chip.
+- interrupt-parent: a phandle for the interrupt controller (see interrupt
+  binding[0]).
+- interrupts: interrupt to which the chip is connected (see interrupt
+  binding[0]).
+
+Optional properties:
+- wakeup-source: touchscreen can be used as a wakeup source.
+- pinctrl-names: should be "default" (see pinctrl binding [1]).
+- pinctrl-0: a phandle pointing to the pin settings for the device (see
+  pinctrl binding [1]).
+
+[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
+[1]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
+
+Example:
+        &i2c1 {
+                /* ... */
+
+                touchscreen@10 {
+                        compatible = "elan,ekth3500";
+                        reg = <0x10>;
+                        interrupt-parent = <&gpio4>;
+                        interrupts = <0x0 IRQ_TYPE_EDGE_FALLING>;
+                        wakeup-source;
+                };
+
+                /* ... */
+        };
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 568a0200fbc2..58917525126e 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -347,6 +347,18 @@ config TOUCHSCREEN_GUNZE
           To compile this driver as a module, choose M here: the
           module will be called gunze.
 
+config TOUCHSCREEN_ELAN
+        tristate "Elan eKTH I2C touchscreen"
+        depends on I2C
+        help
+          Say Y here if you have an Elan eKTH I2C touchscreen
+          connected to your system.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called elants_i2c.
+
 config TOUCHSCREEN_ELO
         tristate "Elo serial touchscreens"
         select SERIO
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index dab4a56ac98e..0242fea2102a 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -31,6 +31,7 @@ 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
+obj-$(CONFIG_TOUCHSCREEN_ELAN)          += elants_i2c.o
 obj-$(CONFIG_TOUCHSCREEN_ELO)           += elo.o
 obj-$(CONFIG_TOUCHSCREEN_EGALAX)        += egalax_ts.o
 obj-$(CONFIG_TOUCHSCREEN_FUJITSU)       += fujitsu_ts.o
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
new file mode 100644
index 000000000000..a510f7ef9b66
--- /dev/null
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -0,0 +1,1271 @@
+/*
+ * Elan Microelectronics touch panels with I2C interface
+ *
+ * Copyright (C) 2014 Elan Microelectronics Corporation.
+ * Scott Liu <scott.liu@emc.com.tw>
+ *
+ * This code is partly based on hid-multitouch.c:
+ *
+ *  Copyright (c) 2010-2012 Stephane Chatty <chatty@enac.fr>
+ *  Copyright (c) 2010-2012 Benjamin Tissoires <benjamin.tissoires@gmail.com>
+ *  Copyright (c) 2010-2012 Ecole Nationale de l'Aviation Civile, France
+ *
+ *
+ * This code is partly based on i2c-hid.c:
+ *
+ * Copyright (c) 2012 Benjamin Tissoires <benjamin.tissoires@gmail.com>
+ * Copyright (c) 2012 Ecole Nationale de l'Aviation Civile, France
+ * Copyright (c) 2012 Red Hat, Inc
+ */
+
+/*
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/async.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include <linux/uaccess.h>
+#include <linux/buffer_head.h>
+#include <linux/version.h>
+#include <linux/slab.h>
+#include <linux/firmware.h>
+#include <linux/version.h>
+#include <linux/input/mt.h>
+#include <linux/acpi.h>
+#include <linux/of.h>
+#include <asm/unaligned.h>
+
+/* Device, Driver information */
+#define DEVICE_NAME     "elants_i2c"
+#define DRV_VERSION     "1.0.9"
+
+/* Convert from rows or columns into resolution */
+#define ELAN_TS_RESOLUTION(n, m)   (((n) - 1) * (m))
+
+/* FW header data */
+#define HEADER_SIZE             4
+#define FW_HDR_TYPE             0
+#define FW_HDR_COUNT            1
+#define FW_HDR_LENGTH           2
+
+/* Buffer mode Queue Header information */
+#define QUEUE_HEADER_SINGLE     0x62
+#define QUEUE_HEADER_NORMAL     0X63
+#define QUEUE_HEADER_WAIT       0x64
+
+/* Command header definition */
+#define CMD_HEADER_WRITE        0x54
+#define CMD_HEADER_READ         0x53
+#define CMD_HEADER_6B_READ      0x5B
+#define CMD_HEADER_RESP         0x52
+#define CMD_HEADER_6B_RESP      0x9B
+#define CMD_HEADER_HELLO        0x55
+#define CMD_HEADER_REK          0x66
+
+/* FW position data */
+#define PACKET_SIZE             55
+#define MAX_CONTACT_NUM         10
+#define FW_POS_HEADER           0
+#define FW_POS_STATE            1
+#define FW_POS_TOTAL            2
+#define FW_POS_XY               3
+#define FW_POS_CHECKSUM         34
+#define FW_POS_WIDTH            35
+#define FW_POS_PRESSURE         45
+
+#define HEADER_REPORT_10_FINGER 0x62
+
+/* Header (4 bytes) plus 3 fill 10-finger packets */
+#define MAX_PACKET_SIZE         169
+
+#define BOOT_TIME_DELAY_MS      50
+
+/* FW read command, 0x53 0x?? 0x0, 0x01 */
+#define E_ELAN_INFO_FW_VER      0x00
+#define E_ELAN_INFO_BC_VER      0x10
+#define E_ELAN_INFO_TEST_VER    0xE0
+#define E_ELAN_INFO_FW_ID       0xF0
+#define E_INFO_OSR              0xD6
+#define E_INFO_PHY_SCAN         0xD7
+#define E_INFO_PHY_DRIVER       0xD8
+
+#define MAX_RETRIES             3
+#define MAX_FW_UPDATE_RETRIES   30
+
+#define ELAN_FW_PAGESIZE        132
+#define ELAN_FW_FILENAME        "elants_i2c.bin"
+
+/* calibration timeout definition */
+#define ELAN_CALI_TIMEOUT_MSEC  10000
+
+enum elants_state {
+        ELAN_STATE_NORMAL,
+        ELAN_WAIT_QUEUE_HEADER,
+        ELAN_WAIT_RECALIBRATION,
+};
+
+enum elants_iap_mode {
+        ELAN_IAP_OPERATIONAL,
+        ELAN_IAP_RECOVERY,
+};