Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

38 files changed, 6376 insertions, 2102 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 0069d9703fda..cabd9e54863f 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -86,6 +86,18 @@ config TOUCHSCREEN_AD7879_SPI
           To compile this driver as a module, choose M here: the
           module will be called ad7879-spi.
 
+config TOUCHSCREEN_ATMEL_MXT
+        tristate "Atmel mXT I2C Touchscreen"
+        depends on I2C
+        help
+          Say Y here if you have Atmel mXT series I2C touchscreen,
+          such as AT42QT602240/ATMXT224, connected to your system.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called atmel_mxt_ts.
+
 config TOUCHSCREEN_BITSY
         tristate "Compaq iPAQ H3600 (Bitsy) touchscreen"
         depends on SA1100_BITSY
@@ -98,6 +110,18 @@ config TOUCHSCREEN_BITSY
           To compile this driver as a module, choose M here: the
           module will be called h3600_ts_input.
 
+config TOUCHSCREEN_BU21013
+        tristate "BU21013 based touch panel controllers"
+        depends on I2C
+        help
+          Say Y here if you have a bu21013 touchscreen connected to
+          your system.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bu21013_ts.
+
 config TOUCHSCREEN_CY8CTMG110
         tristate "cy8ctmg110 touchscreen"
         depends on I2C
@@ -214,6 +238,28 @@ config TOUCHSCREEN_WACOM_W8001
           To compile this driver as a module, choose M here: the
           module will be called wacom_w8001.
 
+config TOUCHSCREEN_LPC32XX
+        tristate "LPC32XX touchscreen controller"
+        depends on ARCH_LPC32XX
+        help
+          Say Y here if you have a LPC32XX device and want
+          to support the built-in touchscreen.
+
+          To compile this driver as a module, choose M here: the
+          module will be called lpc32xx_ts.
+
+config TOUCHSCREEN_MAX11801
+        tristate "MAX11801 based touchscreens"
+        depends on I2C
+        help
+          Say Y here if you have a MAX11801 based touchscreen
+          controller.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called max11801_ts.
+
 config TOUCHSCREEN_MCS5000
         tristate "MELFAS MCS-5000 touchscreen"
         depends on I2C
@@ -250,6 +296,18 @@ config TOUCHSCREEN_INEXIO
           To compile this driver as a module, choose M here: the
           module will be called inexio.
 
+config TOUCHSCREEN_INTEL_MID
+        tristate "Intel MID platform resistive touchscreen"
+        depends on INTEL_SCU_IPC
+        help
+          Say Y here if you have a Intel MID based touchscreen in
+          your system.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called intel_mid_touch.
+
 config TOUCHSCREEN_MK712
         tristate "ICS MicroClock MK712 touchscreen"
         help
@@ -305,18 +363,6 @@ config TOUCHSCREEN_PENMOUNT
           To compile this driver as a module, choose M here: the
           module will be called penmount.
 
-config TOUCHSCREEN_QT602240
-        tristate "QT602240 I2C Touchscreen"
-        depends on I2C
-        help
-          Say Y here if you have the AT42QT602240/ATMXT224 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 qt602240_ts.
-
 config TOUCHSCREEN_MIGOR
         tristate "Renesas MIGO-R touchscreen"
         depends on SH_MIGOR && I2C
@@ -328,6 +374,15 @@ config TOUCHSCREEN_MIGOR
           To compile this driver as a module, choose M here: the
           module will be called migor_ts.
 
+config TOUCHSCREEN_TNETV107X
+        tristate "TI TNETV107X touchscreen support"
+        depends on ARCH_DAVINCI_TNETV107X
+        help
+          Say Y here if you want to use the TNETV107X touchscreen.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tnetv107x-ts.
+
 config TOUCHSCREEN_TOUCHRIGHT
         tristate "Touchright serial touchscreen"
         select SERIO
@@ -380,6 +435,16 @@ config TOUCHSCREEN_UCB1400
           To compile this driver as a module, choose M here: the
           module will be called ucb1400_ts.
 
+config TOUCHSCREEN_WM831X
+        tristate "Support for WM831x touchscreen controllers"
+        depends on MFD_WM831X
+        help
+          This enables support for the touchscreen controller on the WM831x
+          series of PMICs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called wm831x-ts.
+
 config TOUCHSCREEN_WM97XX
         tristate "Support for WM97xx AC97 touchscreen controllers"
         depends on AC97_BUS
@@ -497,62 +562,62 @@ config TOUCHSCREEN_MC13783
 
 config TOUCHSCREEN_USB_EGALAX
         default y
-        bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
+        bool "eGalax, eTurboTouch CT-410/510/700 device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_PANJIT
         default y
-        bool "PanJit device support" if EMBEDDED
+        bool "PanJit device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_3M
         default y
-        bool "3M/Microtouch EX II series device support" if EMBEDDED
+        bool "3M/Microtouch EX II series device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_ITM
         default y
-        bool "ITM device support" if EMBEDDED
+        bool "ITM device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_ETURBO
         default y
-        bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED
+        bool "eTurboTouch (non-eGalax compatible) device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_GUNZE
         default y
-        bool "Gunze AHL61 device support" if EMBEDDED
+        bool "Gunze AHL61 device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_DMC_TSC10
         default y
-        bool "DMC TSC-10/25 device support" if EMBEDDED
+        bool "DMC TSC-10/25 device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_IRTOUCH
         default y
-        bool "IRTOUCHSYSTEMS/UNITOP device support" if EMBEDDED
+        bool "IRTOUCHSYSTEMS/UNITOP device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_IDEALTEK
         default y
-        bool "IdealTEK URTC1000 device support" if EMBEDDED
+        bool "IdealTEK URTC1000 device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_GENERAL_TOUCH
         default y
-        bool "GeneralTouch Touchscreen device support" if EMBEDDED
+        bool "GeneralTouch Touchscreen device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_GOTOP
         default y
-        bool "GoTop Super_Q2/GogoPen/PenPower tablet device support" if EMBEDDED
+        bool "GoTop Super_Q2/GogoPen/PenPower tablet device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_JASTEC
         default y
-        bool "JASTEC/DigiTech DTR-02U USB touch controller device support" if EMBEDDED
+        bool "JASTEC/DigiTech DTR-02U USB touch controller device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_E2I
@@ -562,17 +627,17 @@ config TOUCHSCREEN_USB_E2I
 
 config TOUCHSCREEN_USB_ZYTRONIC
         default y
-        bool "Zytronic controller" if EMBEDDED
+        bool "Zytronic controller" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_ETT_TC45USB
         default y
-        bool "ET&T USB series TC4UM/TC5UH touchscreen controler support" if EMBEDDED
+        bool "ET&T USB series TC4UM/TC5UH touchscreen controller support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_NEXIO
         default y
-        bool "NEXIO/iNexio device support" if EMBEDDED
+        bool "NEXIO/iNexio device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_TOUCHIT213
@@ -586,6 +651,17 @@ config TOUCHSCREEN_TOUCHIT213
           To compile this driver as a module, choose M here: the
           module will be called touchit213.
 
+config TOUCHSCREEN_TSC2005
+        tristate "TSC2005 based touchscreens"
+        depends on SPI_MASTER && GENERIC_HARDIRQS
+        help
+          Say Y here if you have a TSC2005 based touchscreen.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tsc2005.
+
 config TOUCHSCREEN_TSC2007
         tristate "TSC2007 based touchscreens"
         depends on I2C
@@ -616,17 +692,17 @@ config TOUCHSCREEN_PCAP
           To compile this driver as a module, choose M here: the
           module will be called pcap_ts.
 
-config TOUCHSCREEN_TPS6507X
-        tristate "TPS6507x based touchscreens"
+config TOUCHSCREEN_ST1232
+        tristate "Sitronix ST1232 touchscreen controllers"
         depends on I2C
         help
-          Say Y here if you have a TPS6507x based touchscreen
-          controller.
+          Say Y here if you want to support Sitronix ST1232
+          touchscreen controller.
 
           If unsure, say N.
 
           To compile this driver as a module, choose M here: the
-          module will be called tps6507x_ts.
+          module will be called st1232_ts.
 
 config TOUCHSCREEN_STMPE
         tristate "STMicroelectronics STMPE touchscreens"
@@ -638,4 +714,16 @@ config TOUCHSCREEN_STMPE
           To compile this driver as a module, choose M here: the
           module will be called stmpe-ts.
 
+config TOUCHSCREEN_TPS6507X
+        tristate "TPS6507x based touchscreens"
+        depends on I2C
+        help
+          Say Y here if you have a TPS6507x based touchscreen
+          controller.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tps6507x_ts.
+
 endif
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 28217e1dcafd..282d6f76ae26 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -12,8 +12,10 @@ obj-$(CONFIG_TOUCHSCREEN_AD7879)	+= ad7879.o
 obj-$(CONFIG_TOUCHSCREEN_AD7879_I2C)    += ad7879-i2c.o
 obj-$(CONFIG_TOUCHSCREEN_AD7879_SPI)    += ad7879-spi.o
 obj-$(CONFIG_TOUCHSCREEN_ADS7846)       += ads7846.o
+obj-$(CONFIG_TOUCHSCREEN_ATMEL_MXT)     += atmel_mxt_ts.o
 obj-$(CONFIG_TOUCHSCREEN_ATMEL_TSADCC)  += atmel_tsadcc.o
 obj-$(CONFIG_TOUCHSCREEN_BITSY)         += h3600_ts_input.o
+obj-$(CONFIG_TOUCHSCREEN_BU21013)       += bu21013_ts.o
 obj-$(CONFIG_TOUCHSCREEN_CY8CTMG110)    += cy8ctmg110_ts.o
 obj-$(CONFIG_TOUCHSCREEN_DA9034)        += da9034-ts.o
 obj-$(CONFIG_TOUCHSCREEN_DYNAPRO)       += dynapro.o
@@ -23,6 +25,9 @@ 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
+obj-$(CONFIG_TOUCHSCREEN_INTEL_MID)     += intel-mid-touch.o
+obj-$(CONFIG_TOUCHSCREEN_LPC32XX)       += lpc32xx_ts.o
+obj-$(CONFIG_TOUCHSCREEN_MAX11801)      += max11801_ts.o
 obj-$(CONFIG_TOUCHSCREEN_MC13783)       += mc13783_ts.o
 obj-$(CONFIG_TOUCHSCREEN_MCS5000)       += mcs5000_ts.o
 obj-$(CONFIG_TOUCHSCREEN_MIGOR)         += migor_ts.o
@@ -34,15 +39,18 @@ obj-$(CONFIG_TOUCHSCREEN_HTCPEN)	+= htcpen.o
 obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE) += usbtouchscreen.o
 obj-$(CONFIG_TOUCHSCREEN_PCAP)          += pcap_ts.o
 obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)      += penmount.o
-obj-$(CONFIG_TOUCHSCREEN_QT602240)      += qt602240_ts.o
 obj-$(CONFIG_TOUCHSCREEN_S3C2410)       += s3c2410_ts.o
+obj-$(CONFIG_TOUCHSCREEN_ST1232)        += st1232.o
 obj-$(CONFIG_TOUCHSCREEN_STMPE)         += stmpe-ts.o
+obj-$(CONFIG_TOUCHSCREEN_TNETV107X)     += tnetv107x-ts.o
 obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213)    += touchit213.o
 obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)    += touchright.o
 obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)      += touchwin.o
+obj-$(CONFIG_TOUCHSCREEN_TSC2005)       += tsc2005.o
 obj-$(CONFIG_TOUCHSCREEN_TSC2007)       += tsc2007.o
 obj-$(CONFIG_TOUCHSCREEN_UCB1400)       += ucb1400_ts.o
 obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001)   += wacom_w8001.o
+obj-$(CONFIG_TOUCHSCREEN_WM831X)        += wm831x-ts.o
 obj-$(CONFIG_TOUCHSCREEN_WM97XX)        += wm97xx-ts.o
 wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9705)  += wm9705.o
 wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712)  += wm9712.o
diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c
index 5f0221cffef9..714d4e0f9f95 100644
--- a/drivers/input/touchscreen/ad7877.c
+++ b/drivers/input/touchscreen/ad7877.c
@@ -41,6 +41,7 @@
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
+#include <linux/pm.h>
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ad7877.h>
@@ -191,13 +192,12 @@ struct ad7877 {
         struct spi_message      msg;
 
         struct mutex            mutex;
-        unsigned                disabled:1;     /* P: mutex */
-        unsigned                gpio3:1;        /* P: mutex */
-        unsigned                gpio4:1;        /* P: mutex */
+        bool                    disabled;       /* P: mutex */
+        bool                    gpio3;          /* P: mutex */
+        bool                    gpio4;          /* P: mutex */
 
         spinlock_t              lock;
         struct timer_list       timer;          /* P: lock */
-        unsigned                pending:1;      /* P: lock */
 
         /*
          * DMA (thus cache coherency maintenance) requires the
@@ -206,8 +206,8 @@ struct ad7877 {
         u16 conversion_data[AD7877_NR_SENSE] ____cacheline_aligned;
 };
 
-static int gpio3;
-module_param(gpio3, int, 0);
+static bool gpio3;
+module_param(gpio3, bool, 0);
 MODULE_PARM_DESC(gpio3, "If gpio3 is set to 1 AUX3 acts as GPIO3");
 
 /*
@@ -230,6 +230,7 @@ static int ad7877_read(struct spi_device *spi, u16 reg)
                         AD7877_READADD(reg));
         req->xfer[0].tx_buf = &req->command;
         req->xfer[0].len = 2;
+        req->xfer[0].cs_change = 1;
 
         req->xfer[1].rx_buf = &req->sample;
         req->xfer[1].len = 2;
@@ -295,20 +296,25 @@ static int ad7877_read_adc(struct spi_device *spi, unsigned command)
 
         req->xfer[0].tx_buf = &req->reset;
         req->xfer[0].len = 2;
+        req->xfer[0].cs_change = 1;
 
         req->xfer[1].tx_buf = &req->ref_on;
         req->xfer[1].len = 2;
         req->xfer[1].delay_usecs = ts->vref_delay_usecs;
+        req->xfer[1].cs_change = 1;
 
         req->xfer[2].tx_buf = &req->command;
         req->xfer[2].len = 2;
         req->xfer[2].delay_usecs = ts->vref_delay_usecs;
+        req->xfer[2].cs_change = 1;
 
         req->xfer[3].rx_buf = &req->sample;
         req->xfer[3].len = 2;
+        req->xfer[3].cs_change = 1;
 
         req->xfer[4].tx_buf = &ts->cmd_crtl2;   /*REF OFF*/
         req->xfer[4].len = 2;
+        req->xfer[4].cs_change = 1;
 
         req->xfer[5].tx_buf = &ts->cmd_crtl1;   /*DEFAULT*/
         req->xfer[5].len = 2;
@@ -327,7 +333,7 @@ static int ad7877_read_adc(struct spi_device *spi, unsigned command)
         return status ? : sample;
 }
 
-static void ad7877_rx(struct ad7877 *ts)
+static int ad7877_process_data(struct ad7877 *ts)
 {
         struct input_dev *input_dev = ts->input;
         unsigned Rt;
@@ -354,11 +360,25 @@ static void ad7877_rx(struct ad7877 *ts)
                 Rt /= z1;
                 Rt = (Rt + 2047) >> 12;
 
+                /*
+                 * Sample found inconsistent, pressure is beyond
+                 * the maximum. Don't report it to user space.
+                 */
+                if (Rt > ts->pressure_max)
+                        return -EINVAL;
+
+                if (!timer_pending(&ts->timer))
+                        input_report_key(input_dev, BTN_TOUCH, 1);
+
                 input_report_abs(input_dev, ABS_X, x);
                 input_report_abs(input_dev, ABS_Y, y);
                 input_report_abs(input_dev, ABS_PRESSURE, Rt);
                 input_sync(input_dev);
+
+                return 0;
         }
+
+        return -EINVAL;
 }
 
 static inline void ad7877_ts_event_release(struct ad7877 *ts)
@@ -366,72 +386,56 @@ static inline void ad7877_ts_event_release(struct ad7877 *ts)
         struct input_dev *input_dev = ts->input;
 
         input_report_abs(input_dev, ABS_PRESSURE, 0);
+        input_report_key(input_dev, BTN_TOUCH, 0);
         input_sync(input_dev);
 }
 
 static void ad7877_timer(unsigned long handle)
 {
         struct ad7877 *ts = (void *)handle;
+        unsigned long flags;
 
+        spin_lock_irqsave(&ts->lock, flags);
         ad7877_ts_event_release(ts);
+        spin_unlock_irqrestore(&ts->lock, flags);
 }
 
 static irqreturn_t ad7877_irq(int irq, void *handle)
 {
         struct ad7877 *ts = handle;
         unsigned long flags;
-        int status;
+        int error;
 
-        /*
-         * The repeated conversion sequencer controlled by TMR kicked off
-         * too fast. We ignore the last and process the sample sequence
-         * currently in the queue. It can't be older than 9.4ms, and we
-         * need to avoid that ts->msg doesn't get issued twice while in work.
-         */
+        error = spi_sync(ts->spi, &ts->msg);
+        if (error) {
+                dev_err(&ts->spi->dev, "spi_sync --> %d\n", error);
+                goto out;
+        }
 
         spin_lock_irqsave(&ts->lock, flags);
-        if (!ts->pending) {
-                ts->pending = 1;
-
-                status = spi_async(ts->spi, &ts->msg);
-                if (status)
-                        dev_err(&ts->spi->dev, "spi_sync --> %d\n", status);
-        }
+        error = ad7877_process_data(ts);
+        if (!error)
+                mod_timer(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT);
         spin_unlock_irqrestore(&ts->lock, flags);
 
+out:
         return IRQ_HANDLED;
 }
 
-static void ad7877_callback(void *_ts)
-{
-        struct ad7877 *ts = _ts;
-
-        spin_lock_irq(&ts->lock);
-
-        ad7877_rx(ts);
-        ts->pending = 0;
-        mod_timer(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT);
-
-        spin_unlock_irq(&ts->lock);
-}
-
 static void ad7877_disable(struct ad7877 *ts)
 {
         mutex_lock(&ts->mutex);
 
         if (!ts->disabled) {
-                ts->disabled = 1;
+                ts->disabled = true;
                 disable_irq(ts->spi->irq);
 
-                /* Wait for spi_async callback */
-                while (ts->pending)
-                        msleep(1);
-
                 if (del_timer_sync(&ts->timer))
                         ad7877_ts_event_release(ts);
         }
 
-        /* we know the chip's in lowpower mode since we always
+        /*
+         * We know the chip's in lowpower mode since we always
          * leave it that way after every request
          */
 
@@ -443,7 +447,7 @@ static void ad7877_enable(struct ad7877 *ts)
         mutex_lock(&ts->mutex);
 
         if (ts->disabled) {
-                ts->disabled = 0;
+                ts->disabled = false;
                 enable_irq(ts->spi->irq);
         }
 
@@ -453,7 +457,7 @@ static void ad7877_enable(struct ad7877 *ts)
 #define SHOW(name) static ssize_t \
 name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
-        struct ad7877   *ts = dev_get_drvdata(dev); \
+        struct ad7877 *ts = dev_get_drvdata(dev); \
         ssize_t v = ad7877_read_adc(ts->spi, \
                         AD7877_READ_CHAN(name)); \
         if (v < 0) \
@@ -473,7 +477,7 @@ SHOW(temp2)
 static ssize_t ad7877_disable_show(struct device *dev,
                                      struct device_attribute *attr, char *buf)
 {
-        struct ad7877   *ts = dev_get_drvdata(dev);
+        struct ad7877 *ts = dev_get_drvdata(dev);
 
         return sprintf(buf, "%u\n", ts->disabled);
 }
@@ -503,7 +507,7 @@ static DEVICE_ATTR(disable, 0664, ad7877_disable_show, ad7877_disable_store);
 static ssize_t ad7877_dac_show(struct device *dev,
                                      struct device_attribute *attr, char *buf)
 {
-        struct ad7877   *ts = dev_get_drvdata(dev);
+        struct ad7877 *ts = dev_get_drvdata(dev);
 
         return sprintf(buf, "%u\n", ts->dac);
 }
@@ -533,7 +537,7 @@ static DEVICE_ATTR(dac, 0664, ad7877_dac_show, ad7877_dac_store);
 static ssize_t ad7877_gpio3_show(struct device *dev,
                                      struct device_attribute *attr, char *buf)
 {
-        struct ad7877   *ts = dev_get_drvdata(dev);
+        struct ad7877 *ts = dev_get_drvdata(dev);
 
         return sprintf(buf, "%u\n", ts->gpio3);
 }
@@ -564,7 +568,7 @@ static DEVICE_ATTR(gpio3, 0664, ad7877_gpio3_show, ad7877_gpio3_store);
 static ssize_t ad7877_gpio4_show(struct device *dev,
                                      struct device_attribute *attr, char *buf)
 {
-        struct ad7877   *ts = dev_get_drvdata(dev);
+        struct ad7877 *ts = dev_get_drvdata(dev);
 
         return sprintf(buf, "%u\n", ts->gpio4);
 }
@@ -597,16 +601,35 @@ static struct attribute *ad7877_attributes[] = {
         &dev_attr_temp2.attr,
         &dev_attr_aux1.attr,
         &dev_attr_aux2.attr,
+        &dev_attr_aux3.attr,
         &dev_attr_bat1.attr,
         &dev_attr_bat2.attr,
         &dev_attr_disable.attr,
         &dev_attr_dac.attr,
+        &dev_attr_gpio3.attr,
         &dev_attr_gpio4.attr,
         NULL
 };
 
+static mode_t ad7877_attr_is_visible(struct kobject *kobj,
+                                     struct attribute *attr, int n)
+{
+        mode_t mode = attr->mode;
+
+        if (attr == &dev_attr_aux3.attr) {
+                if (gpio3)
+                        mode = 0;
+        } else if (attr == &dev_attr_gpio3.attr) {
+                if (!gpio3)
+                        mode = 0;
+        }
+
+        return mode;
+}
+
 static const struct attribute_group ad7877_attr_group = {
-        .attrs = ad7877_attributes,
+        .is_visible     = ad7877_attr_is_visible,
+        .attrs          = ad7877_attributes,
 };
 
 static void ad7877_setup_ts_def_msg(struct spi_device *spi, struct ad7877 *ts)
@@ -635,22 +658,25 @@ static void ad7877_setup_ts_def_msg(struct spi_device *spi, struct ad7877 *ts)
 
         spi_message_init(m);
 
-        m->complete = ad7877_callback;
         m->context = ts;
 
         ts->xfer[0].tx_buf = &ts->cmd_crtl1;
         ts->xfer[0].len = 2;
+        ts->xfer[0].cs_change = 1;
 
         spi_message_add_tail(&ts->xfer[0], m);
 
         ts->xfer[1].tx_buf = &ts->cmd_dummy; /* Send ZERO */
         ts->xfer[1].len = 2;
+        ts->xfer[1].cs_change = 1;
 
         spi_message_add_tail(&ts->xfer[1], m);
 
-        for (i = 0; i < 11; i++) {
+        for (i = 0; i < AD7877_NR_SENSE; i++) {
                 ts->xfer[i + 2].rx_buf = &ts->conversion_data[AD7877_SEQ_YPOS + i];
                 ts->xfer[i + 2].len = 2;
+                if (i < (AD7877_NR_SENSE - 1))
+                        ts->xfer[i + 2].cs_change = 1;
                 spi_message_add_tail(&ts->xfer[i + 2], m);
         }
 }
@@ -718,6 +744,8 @@ static int __devinit ad7877_probe(struct spi_device *spi)
         input_dev->phys = ts->phys;
         input_dev->dev.parent = &spi->dev;
 
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(BTN_TOUCH, input_dev->keybit);
         __set_bit(EV_ABS, input_dev->evbit);
         __set_bit(ABS_X, input_dev->absbit);
         __set_bit(ABS_Y, input_dev->absbit);
@@ -752,8 +780,9 @@ static int __devinit ad7877_probe(struct spi_device *spi)
 
         /* Request AD7877 /DAV GPIO interrupt */
 
-        err = request_irq(spi->irq, ad7877_irq, IRQF_TRIGGER_FALLING,
-                        spi->dev.driver->name, ts);
+        err = request_threaded_irq(spi->irq, NULL, ad7877_irq,
+                                   IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                   spi->dev.driver->name, ts);
         if (err) {
                 dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
                 goto err_free_mem;
@@ -763,20 +792,12 @@ static int __devinit ad7877_probe(struct spi_device *spi)
         if (err)
                 goto err_free_irq;
 
-        err = device_create_file(&spi->dev,
-                                 gpio3 ? &dev_attr_gpio3 : &dev_attr_aux3);
-        if (err)
-                goto err_remove_attr_group;
-
         err = input_register_device(input_dev);
         if (err)
-                goto err_remove_attr;
+                goto err_remove_attr_group;
 
         return 0;
 
-err_remove_attr:
-        device_remove_file(&spi->dev,
-                           gpio3 ? &dev_attr_gpio3 : &dev_attr_aux3);
 err_remove_attr_group:
         sysfs_remove_group(&spi->dev.kobj, &ad7877_attr_group);
 err_free_irq:
@@ -790,11 +811,9 @@ err_free_mem:
 
 static int __devexit ad7877_remove(struct spi_device *spi)
 {
-        struct ad7877           *ts = dev_get_drvdata(&spi->dev);
+        struct ad7877 *ts = dev_get_drvdata(&spi->dev);
 
         sysfs_remove_group(&spi->dev.kobj, &ad7877_attr_group);
-        device_remove_file(&spi->dev,
-                           gpio3 ? &dev_attr_gpio3 : &dev_attr_aux3);
 
         ad7877_disable(ts);
         free_irq(ts->spi->irq, ts);
@@ -808,39 +827,37 @@ static int __devexit ad7877_remove(struct spi_device *spi)
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int ad7877_suspend(struct spi_device *spi, pm_message_t message)
+#ifdef CONFIG_PM_SLEEP
+static int ad7877_suspend(struct device *dev)
 {
-        struct ad7877 *ts = dev_get_drvdata(&spi->dev);
+        struct ad7877 *ts = dev_get_drvdata(dev);
 
         ad7877_disable(ts);
 
         return 0;
 }
 
-static int ad7877_resume(struct spi_device *spi)
+static int ad7877_resume(struct device *dev)
 {
-        struct ad7877 *ts = dev_get_drvdata(&spi->dev);
+        struct ad7877 *ts = dev_get_drvdata(dev);
 
         ad7877_enable(ts);
 
         return 0;
 }
-#else
-#define ad7877_suspend NULL
-#define ad7877_resume  NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume);
+
 static struct spi_driver ad7877_driver = {
         .driver = {
                 .name   = "ad7877",
                 .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
+                .pm     = &ad7877_pm,
         },
         .probe          = ad7877_probe,
         .remove         = __devexit_p(ad7877_remove),
-        .suspend        = ad7877_suspend,
-        .resume         = ad7877_resume,
 };
 
 static int __init ad7877_init(void)
diff --git a/drivers/input/touchscreen/ad7879-i2c.c b/drivers/input/touchscreen/ad7879-i2c.c
index d82a38ee9a3e..4e4e58cec6c8 100644
--- a/drivers/input/touchscreen/ad7879-i2c.c
+++ b/drivers/input/touchscreen/ad7879-i2c.c
@@ -10,14 +10,16 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/types.h>
+#include <linux/pm.h>
 
 #include "ad7879.h"
 
 #define AD7879_DEVID            0x79    /* AD7879-1/AD7889-1 */
 
 #ifdef CONFIG_PM
-static int ad7879_i2c_suspend(struct i2c_client *client, pm_message_t message)
+static int ad7879_i2c_suspend(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct ad7879 *ts = i2c_get_clientdata(client);
 
         ad7879_suspend(ts);
@@ -25,17 +27,17 @@ static int ad7879_i2c_suspend(struct i2c_client *client, pm_message_t message)
         return 0;
 }
 
-static int ad7879_i2c_resume(struct i2c_client *client)
+static int ad7879_i2c_resume(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct ad7879 *ts = i2c_get_clientdata(client);
 
         ad7879_resume(ts);
 
         return 0;
 }
-#else
-# define ad7879_i2c_suspend NULL
-# define ad7879_i2c_resume  NULL
+
+static SIMPLE_DEV_PM_OPS(ad7879_i2c_pm, ad7879_i2c_suspend, ad7879_i2c_resume);
 #endif
 
 /* All registers are word-sized.
@@ -117,11 +119,12 @@ static struct i2c_driver ad7879_i2c_driver = {
         .driver = {
                 .name   = "ad7879",
                 .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     = &ad7879_i2c_pm,
+#endif
         },
         .probe          = ad7879_i2c_probe,
         .remove         = __devexit_p(ad7879_i2c_remove),
-        .suspend        = ad7879_i2c_suspend,
-        .resume         = ad7879_i2c_resume,
         .id_table       = ad7879_id,
 };
 
diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c
index 59c6e68c4325..ddf732f3cafc 100644
--- a/drivers/input/touchscreen/ad7879-spi.c
+++ b/drivers/input/touchscreen/ad7879-spi.c
@@ -7,6 +7,7 @@
  */
 
 #include <linux/input.h>        /* BUS_SPI */
+#include <linux/pm.h>
 #include <linux/spi/spi.h>
 
 #include "ad7879.h"
@@ -20,9 +21,10 @@
 #define AD7879_WRITECMD(reg) (AD7879_CMD(reg))
 #define AD7879_READCMD(reg)  (AD7879_CMD(reg) | AD7879_CMD_READ)
 
-#ifdef CONFIG_PM
-static int ad7879_spi_suspend(struct spi_device *spi, pm_message_t message)
+#ifdef CONFIG_PM_SLEEP
+static int ad7879_spi_suspend(struct device *dev)
 {
+        struct spi_device *spi = to_spi_device(dev);
         struct ad7879 *ts = spi_get_drvdata(spi);
 
         ad7879_suspend(ts);
@@ -30,19 +32,19 @@ static int ad7879_spi_suspend(struct spi_device *spi, pm_message_t message)
         return 0;
 }
 
-static int ad7879_spi_resume(struct spi_device *spi)
+static int ad7879_spi_resume(struct device *dev)
 {
+        struct spi_device *spi = to_spi_device(dev);
         struct ad7879 *ts = spi_get_drvdata(spi);
 
         ad7879_resume(ts);
 
         return 0;
 }
-#else
-# define ad7879_spi_suspend NULL
-# define ad7879_spi_resume  NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(ad7879_spi_pm, ad7879_spi_suspend, ad7879_spi_resume);
+
 /*
  * ad7879_read/write are only used for initial setup and for sysfs controls.
  * The main traffic is done in ad7879_collect().
@@ -173,11 +175,10 @@ static struct spi_driver ad7879_spi_driver = {
                 .name   = "ad7879",
                 .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
+                .pm     = &ad7879_spi_pm,
         },
         .probe          = ad7879_spi_probe,
         .remove         = __devexit_p(ad7879_spi_remove),
-        .suspend        = ad7879_spi_suspend,
-        .resume         = ad7879_spi_resume,
 };
 
 static int __init ad7879_spi_init(void)
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index ba6f0bd1e762..bc3b5187f3a3 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -129,6 +129,9 @@ struct ad7879 {
         u16                     cmd_crtl1;
         u16                     cmd_crtl2;
         u16                     cmd_crtl3;
+        int                     x;
+        int                     y;
+        int                     Rt;
 };
 
 static int ad7879_read(struct ad7879 *ts, u8 reg)
@@ -175,13 +178,32 @@ static int ad7879_report(struct ad7879 *ts)
                 Rt /= z1;
                 Rt = (Rt + 2047) >> 12;
 
-                if (!timer_pending(&ts->timer))
+                /*
+                 * Sample found inconsistent, pressure is beyond
+                 * the maximum. Don't report it to user space.
+                 */
+                if (Rt > ts->pressure_max)
+                        return -EINVAL;
+
+                /*
+                 * Note that we delay reporting events by one sample.
+                 * This is done to avoid reporting last sample of the
+                 * touch sequence, which may be incomplete if finger
+                 * leaves the surface before last reading is taken.
+                 */
+                if (timer_pending(&ts->timer)) {
+                        /* Touch continues */
                         input_report_key(input_dev, BTN_TOUCH, 1);
+                        input_report_abs(input_dev, ABS_X, ts->x);
+                        input_report_abs(input_dev, ABS_Y, ts->y);
+                        input_report_abs(input_dev, ABS_PRESSURE, ts->Rt);
+                        input_sync(input_dev);
+                }
+
+                ts->x = x;
+                ts->y = y;
+                ts->Rt = Rt;
 
-                input_report_abs(input_dev, ABS_X, x);
-                input_report_abs(input_dev, ABS_Y, y);
-                input_report_abs(input_dev, ABS_PRESSURE, Rt);
-                input_sync(input_dev);
                 return 0;
         }
 
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 16031933a8f6..5196861b86ef 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -17,13 +17,16 @@
  *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation.
  */
+#include <linux/types.h>
 #include <linux/hwmon.h>
 #include <linux/init.h>
 #include <linux/err.h>
+#include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/pm.h>
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
@@ -52,22 +55,23 @@
  * files.
  */
 
-#define TS_POLL_DELAY   (1 * 1000000)   /* ns delay before the first sample */
-#define TS_POLL_PERIOD  (5 * 1000000)   /* ns delay between samples */
+#define TS_POLL_DELAY   1       /* ms delay before the first sample */
+#define TS_POLL_PERIOD  5       /* ms delay between samples */
 
 /* this driver doesn't aim at the peak continuous sample rate */
 #define SAMPLE_BITS     (8 /*cmd*/ + 16 /*sample*/ + 2 /* before, after */)
 
 struct ts_event {
-        /* For portability, we can't read 12 bit values using SPI (which
-         * would make the controller deliver them as native byteorder u16
+        /*
+         * For portability, we can't read 12 bit values using SPI (which
+         * would make the controller deliver them as native byte order u16
          * with msbs zeroed).  Instead, we read them as two 8-bit values,
          * *** WHICH NEED BYTESWAPPING *** and range adjustment.
          */
         u16     x;
         u16     y;
         u16     z1, z2;
-        int     ignore;
+        bool    ignore;
         u8      x_buf[3];
         u8      y_buf[3];
 };
@@ -105,13 +109,17 @@ struct ads7846 {
         u16                     pressure_max;
 
         bool                    swap_xy;
+        bool                    use_internal;
 
         struct ads7846_packet   *packet;
 
         struct spi_transfer     xfer[18];
         struct spi_message      msg[5];
-        struct spi_message      *last_msg;
-        int                     msg_idx;
+        int                     msg_count;
+        wait_queue_head_t       wait;
+
+        bool                    pendown;
+
         int                     read_cnt;
         int                     read_rep;
         int                     last_read;
@@ -122,14 +130,10 @@ struct ads7846 {
 
         u16                     penirq_recheck_delay_usecs;
 
-        spinlock_t              lock;
-        struct hrtimer          timer;
-        unsigned                pendown:1;      /* P: lock */
-        unsigned                pending:1;      /* P: lock */
-// FIXME remove "irq_disabled"
-        unsigned                irq_disabled:1; /* P: lock */
-        unsigned                disabled:1;
-        unsigned                is_suspended:1;
+        struct mutex            lock;
+        bool                    stopped;        /* P: lock */
+        bool                    disabled;       /* P: lock */
+        bool                    suspended;      /* P: lock */
 
         int                     (*filter)(void *data, int data_idx, int *val);
         void                    *filter_data;
@@ -165,7 +169,7 @@ struct ads7846 {
 #define ADS_12_BIT              (0 << 3)
 #define ADS_SER                 (1 << 2)        /* non-differential */
 #define ADS_DFR                 (0 << 2)        /* differential */
-#define ADS_PD10_PDOWN          (0 << 0)        /* lowpower mode + penirq */
+#define ADS_PD10_PDOWN          (0 << 0)        /* low power mode + penirq */
 #define ADS_PD10_ADC_ON         (1 << 0)        /* ADC on */
 #define ADS_PD10_REF_ON         (2 << 0)        /* vREF on + penirq */
 #define ADS_PD10_ALL_ON         (3 << 0)        /* ADC + vREF on */
@@ -193,6 +197,78 @@ struct ads7846 {
 #define REF_ON  (READ_12BIT_DFR(x, 1, 1))
 #define REF_OFF (READ_12BIT_DFR(y, 0, 0))
 
+/* Must be called with ts->lock held */
+static void ads7846_stop(struct ads7846 *ts)
+{
+        if (!ts->disabled && !ts->suspended) {
+                /* Signal IRQ thread to stop polling and disable the handler. */
+                ts->stopped = true;
+                mb();
+                wake_up(&ts->wait);
+                disable_irq(ts->spi->irq);
+        }
+}
+
+/* Must be called with ts->lock held */
+static void ads7846_restart(struct ads7846 *ts)
+{
+        if (!ts->disabled && !ts->suspended) {
+                /* Tell IRQ thread that it may poll the device. */
+                ts->stopped = false;
+                mb();
+                enable_irq(ts->spi->irq);
+        }
+}
+
+/* Must be called with ts->lock held */
+static void __ads7846_disable(struct ads7846 *ts)
+{
+        ads7846_stop(ts);
+        regulator_disable(ts->reg);
+
+        /*
+         * We know the chip's in low power mode since we always
+         * leave it that way after every request
+         */
+}
+
+/* Must be called with ts->lock held */
+static void __ads7846_enable(struct ads7846 *ts)
+{
+        regulator_enable(ts->reg);
+        ads7846_restart(ts);
+}
+
+static void ads7846_disable(struct ads7846 *ts)
+{
+        mutex_lock(&ts->lock);
+
+        if (!ts->disabled) {
+
+                if  (!ts->suspended)
+                        __ads7846_disable(ts);
+
+                ts->disabled = true;
+        }
+
+        mutex_unlock(&ts->lock);
+}
+
+static void ads7846_enable(struct ads7846 *ts)
+{
+        mutex_lock(&ts->lock);
+
+        if (ts->disabled) {
+
+                ts->disabled = false;
+
+                if (!ts->suspended)
+                        __ads7846_enable(ts);
+        }
+
+        mutex_unlock(&ts->lock);
+}
+
 /*--------------------------------------------------------------------------*/
 
 /*
@@ -206,46 +282,41 @@ struct ser_req {
         u8                      command;
         u8                      ref_off;
         u16                     scratch;
-        __be16                  sample;
         struct spi_message      msg;
         struct spi_transfer     xfer[6];
+        /*
+         * DMA (thus cache coherency maintenance) requires the
+         * transfer buffers to live in their own cache lines.
+         */
+        __be16 sample ____cacheline_aligned;
 };
 
 struct ads7845_ser_req {
         u8                      command[3];
-        u8                      pwrdown[3];
-        u8                      sample[3];
         struct spi_message      msg;
         struct spi_transfer     xfer[2];
+        /*
+         * DMA (thus cache coherency maintenance) requires the
+         * transfer buffers to live in their own cache lines.
+         */
+        u8 sample[3] ____cacheline_aligned;
 };
 
-static void ads7846_enable(struct ads7846 *ts);
-static void ads7846_disable(struct ads7846 *ts);
-
-static int device_suspended(struct device *dev)
-{
-        struct ads7846 *ts = dev_get_drvdata(dev);
-        return ts->is_suspended || ts->disabled;
-}
-
 static int ads7846_read12_ser(struct device *dev, unsigned command)
 {
-        struct spi_device       *spi = to_spi_device(dev);
-        struct ads7846          *ts = dev_get_drvdata(dev);
-        struct ser_req          *req = kzalloc(sizeof *req, GFP_KERNEL);
-        int                     status;
-        int                     use_internal;
+        struct spi_device *spi = to_spi_device(dev);
+        struct ads7846 *ts = dev_get_drvdata(dev);
+        struct ser_req *req;
+        int status;
 
+        req = kzalloc(sizeof *req, GFP_KERNEL);
         if (!req)
                 return -ENOMEM;
 
         spi_message_init(&req->msg);
 
-        /* FIXME boards with ads7846 might use external vref instead ... */
-        use_internal = (ts->model == 7846);
-
         /* maybe turn on internal vREF, and let it settle */
-        if (use_internal) {
+        if (ts->use_internal) {
                 req->ref_on = REF_ON;
                 req->xfer[0].tx_buf = &req->ref_on;
                 req->xfer[0].len = 1;
@@ -257,8 +328,14 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
                 /* for 1uF, settle for 800 usec; no cap, 100 usec.  */
                 req->xfer[1].delay_usecs = ts->vref_delay_usecs;
                 spi_message_add_tail(&req->xfer[1], &req->msg);
+
+                /* Enable reference voltage */
+                command |= ADS_PD10_REF_ON;
         }
 
+        /* Enable ADC in every case */
+        command |= ADS_PD10_ADC_ON;
+
         /* take sample */
         req->command = (u8) command;
         req->xfer[2].tx_buf = &req->command;
@@ -282,11 +359,11 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
         CS_CHANGE(req->xfer[5]);
         spi_message_add_tail(&req->xfer[5], &req->msg);
 
-        ts->irq_disabled = 1;
-        disable_irq(spi->irq);
+        mutex_lock(&ts->lock);
+        ads7846_stop(ts);
         status = spi_sync(spi, &req->msg);
-        ts->irq_disabled = 0;
-        enable_irq(spi->irq);
+        ads7846_restart(ts);
+        mutex_unlock(&ts->lock);
 
         if (status == 0) {
                 /* on-wire is a must-ignore bit, a BE12 value, then padding */
@@ -301,11 +378,12 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
 
 static int ads7845_read12_ser(struct device *dev, unsigned command)
 {
-        struct spi_device       *spi = to_spi_device(dev);
-        struct ads7846          *ts = dev_get_drvdata(dev);
-        struct ads7845_ser_req  *req = kzalloc(sizeof *req, GFP_KERNEL);
-        int                     status;
+        struct spi_device *spi = to_spi_device(dev);
+        struct ads7846 *ts = dev_get_drvdata(dev);
+        struct ads7845_ser_req *req;
+        int status;
 
+        req = kzalloc(sizeof *req, GFP_KERNEL);
         if (!req)
                 return -ENOMEM;
 
@@ -317,11 +395,11 @@ static int ads7845_read12_ser(struct device *dev, unsigned command)
         req->xfer[0].len = 3;
         spi_message_add_tail(&req->xfer[0], &req->msg);
 
-        ts->irq_disabled = 1;
-        disable_irq(spi->irq);
+        mutex_lock(&ts->lock);
+        ads7846_stop(ts);
         status = spi_sync(spi, &req->msg);
-        ts->irq_disabled = 0;
-        enable_irq(spi->irq);
+        ads7846_restart(ts);
+        mutex_unlock(&ts->lock);
 
         if (status == 0) {
                 /* BE12 value, then padding */
@@ -341,7 +419,7 @@ name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct ads7846 *ts = dev_get_drvdata(dev); \
         ssize_t v = ads7846_read12_ser(dev, \
-                        READ_12BIT_SER(var) | ADS_PD10_ALL_ON); \
+                        READ_12BIT_SER(var)); \
         if (v < 0) \
                 return v; \
         return sprintf(buf, "%u\n", adjust(ts, v)); \
@@ -374,6 +452,7 @@ static inline unsigned vaux_adjust(struct ads7846 *ts, ssize_t v)
         /* external resistors may scale vAUX into 0..vREF */
         retval *= ts->vref_mv;
         retval = retval >> 12;
+
         return retval;
 }
 
@@ -384,13 +463,13 @@ static inline unsigned vbatt_adjust(struct ads7846 *ts, ssize_t v)
         /* ads7846 has a resistor ladder to scale this signal down */
         if (ts->model == 7846)
                 retval *= 4;
+
         return retval;
 }
 
 SHOW(in0_input, vaux, vaux_adjust)
 SHOW(in1_input, vbatt, vbatt_adjust)
 
-
 static struct attribute *ads7846_attributes[] = {
         &dev_attr_temp0.attr,
         &dev_attr_temp1.attr,
@@ -433,6 +512,7 @@ static int ads784x_hwmon_register(struct spi_device *spi, struct ads7846 *ts)
                 if (!ts->vref_mv) {
                         dev_dbg(&spi->dev, "assuming 2.5V internal vREF\n");
                         ts->vref_mv = 2500;
+                        ts->use_internal = true;
                 }
                 break;
         case 7845:
@@ -498,17 +578,12 @@ static inline void ads784x_hwmon_unregister(struct spi_device *spi,
 }
 #endif
 
-static int is_pen_down(struct device *dev)
-{
-        struct ads7846  *ts = dev_get_drvdata(dev);
-
-        return ts->pendown;
-}
-
 static ssize_t ads7846_pen_down_show(struct device *dev,
                                      struct device_attribute *attr, char *buf)
 {
-        return sprintf(buf, "%u\n", is_pen_down(dev));
+        struct ads7846 *ts = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%u\n", ts->pendown);
 }
 
 static DEVICE_ATTR(pen_down, S_IRUGO, ads7846_pen_down_show, NULL);
@@ -516,7 +591,7 @@ static DEVICE_ATTR(pen_down, S_IRUGO, ads7846_pen_down_show, NULL);
 static ssize_t ads7846_disable_show(struct device *dev,
                                      struct device_attribute *attr, char *buf)
 {
-        struct ads7846  *ts = dev_get_drvdata(dev);
+        struct ads7846 *ts = dev_get_drvdata(dev);
 
         return sprintf(buf, "%u\n", ts->disabled);
 }
@@ -531,15 +606,11 @@ static ssize_t ads7846_disable_store(struct device *dev,
         if (strict_strtoul(buf, 10, &i))
                 return -EINVAL;
 
-        spin_lock_irq(&ts->lock);
-
         if (i)
                 ads7846_disable(ts);
         else
                 ads7846_enable(ts);
 
-        spin_unlock_irq(&ts->lock);
-
         return count;
 }
 
@@ -569,23 +640,141 @@ static void null_wait_for_sync(void)
 {
 }
 
-/*
- * PENIRQ only kicks the timer.  The timer only reissues the SPI transfer,
- * to retrieve touchscreen status.
- *
- * The SPI transfer completion callback does the real work.  It reports
- * touchscreen events and reactivates the timer (or IRQ) as appropriate.
- */
+static int ads7846_debounce_filter(void *ads, int data_idx, int *val)
+{
+        struct ads7846 *ts = ads;
+
+        if (!ts->read_cnt || (abs(ts->last_read - *val) > ts->debounce_tol)) {
+                /* Start over collecting consistent readings. */
+                ts->read_rep = 0;
+                /*
+                 * Repeat it, if this was the first read or the read
+                 * wasn't consistent enough.
+                 */
+                if (ts->read_cnt < ts->debounce_max) {
+                        ts->last_read = *val;
+                        ts->read_cnt++;
+                        return ADS7846_FILTER_REPEAT;
+                } else {
+                        /*
+                         * Maximum number of debouncing reached and still
+                         * not enough number of consistent readings. Abort
+                         * the whole sample, repeat it in the next sampling
+                         * period.
+                         */
+                        ts->read_cnt = 0;
+                        return ADS7846_FILTER_IGNORE;
+                }
+        } else {
+                if (++ts->read_rep > ts->debounce_rep) {
+                        /*
+                         * Got a good reading for this coordinate,
+                         * go for the next one.
+                         */
+                        ts->read_cnt = 0;
+                        ts->read_rep = 0;
+                        return ADS7846_FILTER_OK;
+                } else {
+                        /* Read more values that are consistent. */
+                        ts->read_cnt++;
+                        return ADS7846_FILTER_REPEAT;
+                }
+        }
+}
+
+static int ads7846_no_filter(void *ads, int data_idx, int *val)
+{
+        return ADS7846_FILTER_OK;
+}
+
+static int ads7846_get_value(struct ads7846 *ts, struct spi_message *m)
+{
+        struct spi_transfer *t =
+                list_entry(m->transfers.prev, struct spi_transfer, transfer_list);
+
+        if (ts->model == 7845) {
+                return be16_to_cpup((__be16 *)&(((char*)t->rx_buf)[1])) >> 3;
+        } else {
+                /*
+                 * adjust:  on-wire is a must-ignore bit, a BE12 value, then
+                 * padding; built from two 8 bit values written msb-first.
+                 */
+                return be16_to_cpup((__be16 *)t->rx_buf) >> 3;
+        }
+}
+
+static void ads7846_update_value(struct spi_message *m, int val)
+{
+        struct spi_transfer *t =
+                list_entry(m->transfers.prev, struct spi_transfer, transfer_list);
 
-static void ads7846_rx(void *ads)
+        *(u16 *)t->rx_buf = val;
+}
+
+static void ads7846_read_state(struct ads7846 *ts)
 {
-        struct ads7846          *ts = ads;
-        struct ads7846_packet   *packet = ts->packet;
-        unsigned                Rt;
-        u16                     x, y, z1, z2;
+        struct ads7846_packet *packet = ts->packet;
+        struct spi_message *m;
+        int msg_idx = 0;
+        int val;
+        int action;
+        int error;
 
-        /* ads7846_rx_val() did in-place conversion (including byteswap) from
-         * on-the-wire format as part of debouncing to get stable readings.
+        while (msg_idx < ts->msg_count) {
+
+                ts->wait_for_sync();
+
+                m = &ts->msg[msg_idx];
+                error = spi_sync(ts->spi, m);
+                if (error) {
+                        dev_err(&ts->spi->dev, "spi_async --> %d\n", error);
+                        packet->tc.ignore = true;
+                        return;
+                }
+
+                /*
+                 * Last message is power down request, no need to convert
+                 * or filter the value.
+                 */
+                if (msg_idx < ts->msg_count - 1) {
+
+                        val = ads7846_get_value(ts, m);
+
+                        action = ts->filter(ts->filter_data, msg_idx, &val);
+                        switch (action) {
+                        case ADS7846_FILTER_REPEAT:
+                                continue;
+
+                        case ADS7846_FILTER_IGNORE:
+                                packet->tc.ignore = true;
+                                msg_idx = ts->msg_count - 1;
+                                continue;
+
+                        case ADS7846_FILTER_OK:
+                                ads7846_update_value(m, val);
+                                packet->tc.ignore = false;
+                                msg_idx++;
+                                break;
+
+                        default:
+                                BUG();
+                        }
+                } else {
+                        msg_idx++;
+                }
+        }
+}
+
+static void ads7846_report_state(struct ads7846 *ts)
+{
+        struct ads7846_packet *packet = ts->packet;
+        unsigned int Rt;
+        u16 x, y, z1, z2;
+
+        /*
+         * ads7846_get_value() does in-place conversion (including byte swap)
+         * from on-the-wire format as part of debouncing to get stable
+         * readings.
          */
         if (ts->model == 7845) {
                 x = *(u16 *)packet->tc.x_buf;
@@ -623,19 +812,19 @@ static void ads7846_rx(void *ads)
                 Rt = 0;
         }
 
-        /* Sample found inconsistent by debouncing or pressure is beyond
+        /*
+         * Sample found inconsistent by debouncing or pressure is beyond
          * the maximum. Don't report it to user space, repeat at least
          * once more the measurement
          */
         if (packet->tc.ignore || Rt > ts->pressure_max) {
                 dev_vdbg(&ts->spi->dev, "ignored %d pressure %d\n",
                          packet->tc.ignore, Rt);
-                hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_PERIOD),
-                              HRTIMER_MODE_REL);
                 return;
         }
 
-        /* Maybe check the pendown state before reporting. This discards
+        /*
+         * Maybe check the pendown state before reporting. This discards
          * false readings when the pen is lifted.
          */
         if (ts->penirq_recheck_delay_usecs) {
@@ -644,8 +833,9 @@ static void ads7846_rx(void *ads)
                         Rt = 0;
         }
 
-        /* NOTE: We can't rely on the pressure to determine the pen down
-         * state, even this controller has a pressure sensor.  The pressure
+        /*
+         * NOTE: We can't rely on the pressure to determine the pen down
+         * state, even this controller has a pressure sensor. The pressure
          * value can fluctuate for quite a while after lifting the pen and
          * in some cases may not even settle at the expected value.
          *
@@ -655,15 +845,15 @@ static void ads7846_rx(void *ads)
         if (Rt) {
                 struct input_dev *input = ts->input;
 
+                if (ts->swap_xy)
+                        swap(x, y);
+
                 if (!ts->pendown) {
                         input_report_key(input, BTN_TOUCH, 1);
-                        ts->pendown = 1;
+                        ts->pendown = true;
                         dev_vdbg(&ts->spi->dev, "DOWN\n");
                 }
 
-                if (ts->swap_xy)
-                        swap(x, y);
-
                 input_report_abs(input, ABS_X, x);
                 input_report_abs(input, ABS_Y, y);
                 input_report_abs(input, ABS_PRESSURE, ts->pressure_max - Rt);
@@ -671,407 +861,161 @@ static void ads7846_rx(void *ads)
                 input_sync(input);
                 dev_vdbg(&ts->spi->dev, "%4d/%4d/%4d\n", x, y, Rt);
         }
-
-        hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_PERIOD),
-                        HRTIMER_MODE_REL);
 }
 
-static int ads7846_debounce(void *ads, int data_idx, int *val)
+static irqreturn_t ads7846_hard_irq(int irq, void *handle)
 {
-        struct ads7846          *ts = ads;
+        struct ads7846 *ts = handle;
 
-        if (!ts->read_cnt || (abs(ts->last_read - *val) > ts->debounce_tol)) {
-                /* Start over collecting consistent readings. */
-                ts->read_rep = 0;
-                /* Repeat it, if this was the first read or the read
-                 * wasn't consistent enough. */
-                if (ts->read_cnt < ts->debounce_max) {
-                        ts->last_read = *val;
-                        ts->read_cnt++;
-                        return ADS7846_FILTER_REPEAT;
-                } else {
-                        /* Maximum number of debouncing reached and still
-                         * not enough number of consistent readings. Abort
-                         * the whole sample, repeat it in the next sampling
-                         * period.
-                         */
-                        ts->read_cnt = 0;
-                        return ADS7846_FILTER_IGNORE;
-                }
-        } else {
-                if (++ts->read_rep > ts->debounce_rep) {
-                        /* Got a good reading for this coordinate,
-                         * go for the next one. */
-                        ts->read_cnt = 0;
-                        ts->read_rep = 0;
-                        return ADS7846_FILTER_OK;
-                } else {
-                        /* Read more values that are consistent. */
-                        ts->read_cnt++;
-                        return ADS7846_FILTER_REPEAT;
-                }
-        }
+        return get_pendown_state(ts) ? IRQ_WAKE_THREAD : IRQ_HANDLED;
 }
 
-static int ads7846_no_filter(void *ads, int data_idx, int *val)
-{
-        return ADS7846_FILTER_OK;
-}
 
-static void ads7846_rx_val(void *ads)
+static irqreturn_t ads7846_irq(int irq, void *handle)
 {
-        struct ads7846 *ts = ads;
-        struct ads7846_packet *packet = ts->packet;
-        struct spi_message *m;
-        struct spi_transfer *t;
-        int val;
-        int action;
-        int status;
-
-        m = &ts->msg[ts->msg_idx];
-        t = list_entry(m->transfers.prev, struct spi_transfer, transfer_list);
+        struct ads7846 *ts = handle;
 
-        if (ts->model == 7845) {
-                val = be16_to_cpup((__be16 *)&(((char*)t->rx_buf)[1])) >> 3;
-        } else {
-                /* adjust:  on-wire is a must-ignore bit, a BE12 value, then
-                 * padding; built from two 8 bit values written msb-first.
-                 */
-                val = be16_to_cpup((__be16 *)t->rx_buf) >> 3;
-        }
+        /* Start with a small delay before checking pendown state */
+        msleep(TS_POLL_DELAY);
 
-        action = ts->filter(ts->filter_data, ts->msg_idx, &val);
-        switch (action) {
-        case ADS7846_FILTER_REPEAT:
-                break;
-        case ADS7846_FILTER_IGNORE:
-                packet->tc.ignore = 1;
-                /* Last message will contain ads7846_rx() as the
-                 * completion function.
-                 */
-                m = ts->last_msg;
-                break;
-        case ADS7846_FILTER_OK:
-                *(u16 *)t->rx_buf = val;
-                packet->tc.ignore = 0;
-                m = &ts->msg[++ts->msg_idx];
-                break;
-        default:
-                BUG();
-        }
-        ts->wait_for_sync();
-        status = spi_async(ts->spi, m);
-        if (status)
-                dev_err(&ts->spi->dev, "spi_async --> %d\n",
-                                status);
-}
+        while (!ts->stopped && get_pendown_state(ts)) {
 
-static enum hrtimer_restart ads7846_timer(struct hrtimer *handle)
-{
-        struct ads7846  *ts = container_of(handle, struct ads7846, timer);
-        int             status = 0;
+                /* pen is down, continue with the measurement */
+                ads7846_read_state(ts);
 
-        spin_lock(&ts->lock);
+                if (!ts->stopped)
+                        ads7846_report_state(ts);
 
-        if (unlikely(!get_pendown_state(ts) ||
-                     device_suspended(&ts->spi->dev))) {
-                if (ts->pendown) {
-                        struct input_dev *input = ts->input;
+                wait_event_timeout(ts->wait, ts->stopped,
+                                   msecs_to_jiffies(TS_POLL_PERIOD));
+        }
 
-                        input_report_key(input, BTN_TOUCH, 0);
-                        input_report_abs(input, ABS_PRESSURE, 0);
-                        input_sync(input);
+        if (ts->pendown) {
+                struct input_dev *input = ts->input;
 
-                        ts->pendown = 0;
-                        dev_vdbg(&ts->spi->dev, "UP\n");
-                }
+                input_report_key(input, BTN_TOUCH, 0);
+                input_report_abs(input, ABS_PRESSURE, 0);
+                input_sync(input);
 
-                /* measurement cycle ended */
-                if (!device_suspended(&ts->spi->dev)) {
-                        ts->irq_disabled = 0;
-                        enable_irq(ts->spi->irq);
-                }
-                ts->pending = 0;
-        } else {
-                /* pen is still down, continue with the measurement */
-                ts->msg_idx = 0;
-                ts->wait_for_sync();
-                status = spi_async(ts->spi, &ts->msg[0]);
-                if (status)
-                        dev_err(&ts->spi->dev, "spi_async --> %d\n", status);
+                ts->pendown = false;
+                dev_vdbg(&ts->spi->dev, "UP\n");
         }
 
-        spin_unlock(&ts->lock);
-        return HRTIMER_NORESTART;
+        return IRQ_HANDLED;
 }
 
-static irqreturn_t ads7846_irq(int irq, void *handle)
+#ifdef CONFIG_PM_SLEEP
+static int ads7846_suspend(struct device *dev)
 {
-        struct ads7846 *ts = handle;
-        unsigned long flags;
-
-        spin_lock_irqsave(&ts->lock, flags);
-        if (likely(get_pendown_state(ts))) {
-                if (!ts->irq_disabled) {
-                        /* The ARM do_simple_IRQ() dispatcher doesn't act
-                         * like the other dispatchers:  it will report IRQs
-                         * even after they've been disabled.  We work around
-                         * that here.  (The "generic irq" framework may help...)
-                         */
-                        ts->irq_disabled = 1;
-                        disable_irq_nosync(ts->spi->irq);
-                        ts->pending = 1;
-                        hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY),
-                                        HRTIMER_MODE_REL);
-                }
-        }
-        spin_unlock_irqrestore(&ts->lock, flags);
+        struct ads7846 *ts = dev_get_drvdata(dev);
 
-        return IRQ_HANDLED;
-}
+        mutex_lock(&ts->lock);
 
-/*--------------------------------------------------------------------------*/
+        if (!ts->suspended) {
 
-/* Must be called with ts->lock held */
-static void ads7846_disable(struct ads7846 *ts)
-{
-        if (ts->disabled)
-                return;
+                if (!ts->disabled)
+                        __ads7846_disable(ts);
 
-        ts->disabled = 1;
+                if (device_may_wakeup(&ts->spi->dev))
+                        enable_irq_wake(ts->spi->irq);
 
-        /* are we waiting for IRQ, or polling? */
-        if (!ts->pending) {
-                ts->irq_disabled = 1;
-                disable_irq(ts->spi->irq);
-        } else {
-                /* the timer will run at least once more, and
-                 * leave everything in a clean state, IRQ disabled
-                 */
-                while (ts->pending) {
-                        spin_unlock_irq(&ts->lock);
-                        msleep(1);
-                        spin_lock_irq(&ts->lock);
-                }
+                ts->suspended = true;
         }
 
-        regulator_disable(ts->reg);
+        mutex_unlock(&ts->lock);
 
-        /* we know the chip's in lowpower mode since we always
-         * leave it that way after every request
-         */
+        return 0;
 }
 
-/* Must be called with ts->lock held */
-static void ads7846_enable(struct ads7846 *ts)
+static int ads7846_resume(struct device *dev)
 {
-        if (!ts->disabled)
-                return;
-
-        regulator_enable(ts->reg);
+        struct ads7846 *ts = dev_get_drvdata(dev);
 
-        ts->disabled = 0;
-        ts->irq_disabled = 0;
-        enable_irq(ts->spi->irq);
-}
+        mutex_lock(&ts->lock);
 
-static int ads7846_suspend(struct spi_device *spi, pm_message_t message)
-{
-        struct ads7846 *ts = dev_get_drvdata(&spi->dev);
+        if (ts->suspended) {
 
-        spin_lock_irq(&ts->lock);
+                ts->suspended = false;
 
-        ts->is_suspended = 1;
-        ads7846_disable(ts);
+                if (device_may_wakeup(&ts->spi->dev))
+                        disable_irq_wake(ts->spi->irq);
 
-        spin_unlock_irq(&ts->lock);
+                if (!ts->disabled)
+                        __ads7846_enable(ts);
+        }
 
-        if (device_may_wakeup(&ts->spi->dev))
-                enable_irq_wake(ts->spi->irq);
+        mutex_unlock(&ts->lock);
 
         return 0;
-
 }
+#endif
 
-static int ads7846_resume(struct spi_device *spi)
-{
-        struct ads7846 *ts = dev_get_drvdata(&spi->dev);
-
-        if (device_may_wakeup(&ts->spi->dev))
-                disable_irq_wake(ts->spi->irq);
-
-        spin_lock_irq(&ts->lock);
-
-        ts->is_suspended = 0;
-        ads7846_enable(ts);
-
-        spin_unlock_irq(&ts->lock);
-
-        return 0;
-}
+static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume);
 
-static int __devinit setup_pendown(struct spi_device *spi, struct ads7846 *ts)
+static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads7846 *ts)
 {
         struct ads7846_platform_data *pdata = spi->dev.platform_data;
         int err;
 
-        /* REVISIT when the irq can be triggered active-low, or if for some
+        /*
+         * REVISIT when the irq can be triggered active-low, or if for some
          * reason the touchscreen isn't hooked up, we don't need to access
          * the pendown state.
          */
-        if (!pdata->get_pendown_state && !gpio_is_valid(pdata->gpio_pendown)) {
-                dev_err(&spi->dev, "no get_pendown_state nor gpio_pendown?\n");
-                return -EINVAL;
-        }
 
         if (pdata->get_pendown_state) {
                 ts->get_pendown_state = pdata->get_pendown_state;
-                return 0;
-        }
+        } else if (gpio_is_valid(pdata->gpio_pendown)) {
 
-        err = gpio_request(pdata->gpio_pendown, "ads7846_pendown");
-        if (err) {
-                dev_err(&spi->dev, "failed to request pendown GPIO%d\n",
+                err = gpio_request(pdata->gpio_pendown, "ads7846_pendown");
+                if (err) {
+                        dev_err(&spi->dev, "failed to request pendown GPIO%d\n",
                                 pdata->gpio_pendown);
-                return err;
-        }
-
-        ts->gpio_pendown = pdata->gpio_pendown;
-        return 0;
-}
-
-static int __devinit ads7846_probe(struct spi_device *spi)
-{
-        struct ads7846 *ts;
-        struct ads7846_packet *packet;
-        struct input_dev *input_dev;
-        const struct ads7846_platform_data *pdata = spi->dev.platform_data;
-        struct spi_message *m;
-        struct spi_transfer *x;
-        unsigned long irq_flags;
-        int vref;
-        int err;
-
-        if (!spi->irq) {
-                dev_dbg(&spi->dev, "no IRQ?\n");
-                return -ENODEV;
-        }
+                        return err;
+                }
+                err = gpio_direction_input(pdata->gpio_pendown);
+                if (err) {
+                        dev_err(&spi->dev, "failed to setup pendown GPIO%d\n",
+                                pdata->gpio_pendown);
+                        gpio_free(pdata->gpio_pendown);
+                        return err;
+                }
 
-        if (!pdata) {
-                dev_dbg(&spi->dev, "no platform data?\n");
-                return -ENODEV;
-        }
+                ts->gpio_pendown = pdata->gpio_pendown;
 
-        /* don't exceed max specified sample rate */
-        if (spi->max_speed_hz > (125000 * SAMPLE_BITS)) {
-                dev_dbg(&spi->dev, "f(sample) %d KHz?\n",
-                                (spi->max_speed_hz/SAMPLE_BITS)/1000);
+        } else {
+                dev_err(&spi->dev, "no get_pendown_state nor gpio_pendown?\n");
                 return -EINVAL;
         }
 
-        /* We'd set TX wordsize 8 bits and RX wordsize to 13 bits ... except
-         * that even if the hardware can do that, the SPI controller driver
-         * may not.  So we stick to very-portable 8 bit words, both RX and TX.
-         */
-        spi->bits_per_word = 8;
-        spi->mode = SPI_MODE_0;
-        err = spi_setup(spi);
-        if (err < 0)
-                return err;
-
-        ts = kzalloc(sizeof(struct ads7846), GFP_KERNEL);
-        packet = kzalloc(sizeof(struct ads7846_packet), GFP_KERNEL);
-        input_dev = input_allocate_device();
-        if (!ts || !packet || !input_dev) {
-                err = -ENOMEM;
-                goto err_free_mem;
-        }
-
-        dev_set_drvdata(&spi->dev, ts);
-
-        ts->packet = packet;
-        ts->spi = spi;
-        ts->input = input_dev;
-        ts->vref_mv = pdata->vref_mv;
-        ts->swap_xy = pdata->swap_xy;
-
-        hrtimer_init(&ts->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-        ts->timer.function = ads7846_timer;
-
-        spin_lock_init(&ts->lock);
-
-        ts->model = pdata->model ? : 7846;
-        ts->vref_delay_usecs = pdata->vref_delay_usecs ? : 100;
-        ts->x_plate_ohms = pdata->x_plate_ohms ? : 400;
-        ts->pressure_max = pdata->pressure_max ? : ~0;
-
-        if (pdata->filter != NULL) {
-                if (pdata->filter_init != NULL) {
-                        err = pdata->filter_init(pdata, &ts->filter_data);
-                        if (err < 0)
-                                goto err_free_mem;
-                }
-                ts->filter = pdata->filter;
-                ts->filter_cleanup = pdata->filter_cleanup;
-        } else if (pdata->debounce_max) {
-                ts->debounce_max = pdata->debounce_max;
-                if (ts->debounce_max < 2)
-                        ts->debounce_max = 2;
-                ts->debounce_tol = pdata->debounce_tol;
-                ts->debounce_rep = pdata->debounce_rep;
-                ts->filter = ads7846_debounce;
-                ts->filter_data = ts;
-        } else
-                ts->filter = ads7846_no_filter;
-
-        err = setup_pendown(spi, ts);
-        if (err)
-                goto err_cleanup_filter;
-
-        if (pdata->penirq_recheck_delay_usecs)
-                ts->penirq_recheck_delay_usecs =
-                                pdata->penirq_recheck_delay_usecs;
-
-        ts->wait_for_sync = pdata->wait_for_sync ? : null_wait_for_sync;
-
-        snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(&spi->dev));
-        snprintf(ts->name, sizeof(ts->name), "ADS%d Touchscreen", ts->model);
-
-        input_dev->name = ts->name;
-        input_dev->phys = ts->phys;
-        input_dev->dev.parent = &spi->dev;
-
-        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
-        input_set_abs_params(input_dev, ABS_X,
-                        pdata->x_min ? : 0,
-                        pdata->x_max ? : MAX_12BIT,
-                        0, 0);
-        input_set_abs_params(input_dev, ABS_Y,
-                        pdata->y_min ? : 0,
-                        pdata->y_max ? : MAX_12BIT,
-                        0, 0);
-        input_set_abs_params(input_dev, ABS_PRESSURE,
-                        pdata->pressure_min, pdata->pressure_max, 0, 0);
+        return 0;
+}
 
-        vref = pdata->keep_vref_on;
+/*
+ * Set up the transfers to read touchscreen state; this assumes we
+ * use formula #2 for pressure, not #3.
+ */
+static void __devinit ads7846_setup_spi_msg(struct ads7846 *ts,
+                                const struct ads7846_platform_data *pdata)
+{
+        struct spi_message *m = &ts->msg[0];
+        struct spi_transfer *x = ts->xfer;
+        struct ads7846_packet *packet = ts->packet;
+        int vref = pdata->keep_vref_on;
 
         if (ts->model == 7873) {
-                /* The AD7873 is almost identical to the ADS7846
+                /*
+                 * The AD7873 is almost identical to the ADS7846
                  * keep VREF off during differential/ratiometric
-                 * conversion modes
+                 * conversion modes.
                  */
                 ts->model = 7846;
                 vref = 0;
         }
 
-        /* set up the transfers to read touchscreen state; this assumes we
-         * use formula #2 for pressure, not #3.
-         */
-        m = &ts->msg[0];
-        x = ts->xfer;
-
+        ts->msg_count = 1;
         spi_message_init(m);
+        m->context = ts;
 
         if (ts->model == 7845) {
                 packet->read_y_cmd[0] = READ_Y(vref);
@@ -1094,7 +1038,8 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 spi_message_add_tail(x, m);
         }
 
-        /* the first sample after switching drivers can be low quality;
+        /*
+         * The first sample after switching drivers can be low quality;
          * optionally discard it, using a second one after the signals
          * have had enough time to stabilize.
          */
@@ -1112,11 +1057,10 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 spi_message_add_tail(x, m);
         }
 
-        m->complete = ads7846_rx_val;
-        m->context = ts;
-
+        ts->msg_count++;
         m++;
         spi_message_init(m);
+        m->context = ts;
 
         if (ts->model == 7845) {
                 x++;
@@ -1156,13 +1100,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 spi_message_add_tail(x, m);
         }
 
-        m->complete = ads7846_rx_val;
-        m->context = ts;
-
         /* turn y+ off, x- on; we'll use formula #2 */
         if (ts->model == 7846) {
+                ts->msg_count++;
                 m++;
                 spi_message_init(m);
+                m->context = ts;
 
                 x++;
                 packet->read_z1 = READ_Z1(vref);
@@ -1190,11 +1133,10 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                         spi_message_add_tail(x, m);
                 }
 
-                m->complete = ads7846_rx_val;
-                m->context = ts;
-
+                ts->msg_count++;
                 m++;
                 spi_message_init(m);
+                m->context = ts;
 
                 x++;
                 packet->read_z2 = READ_Z2(vref);
@@ -1221,14 +1163,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                         x->len = 2;
                         spi_message_add_tail(x, m);
                 }
-
-                m->complete = ads7846_rx_val;
-                m->context = ts;
         }
 
         /* power down */
+        ts->msg_count++;
         m++;
         spi_message_init(m);
+        m->context = ts;
 
         if (ts->model == 7845) {
                 x++;
@@ -1251,11 +1192,119 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 
         CS_CHANGE(*x);
         spi_message_add_tail(x, m);
+}
 
-        m->complete = ads7846_rx;
-        m->context = ts;
+static int __devinit ads7846_probe(struct spi_device *spi)
+{
+        struct ads7846 *ts;
+        struct ads7846_packet *packet;
+        struct input_dev *input_dev;
+        struct ads7846_platform_data *pdata = spi->dev.platform_data;
+        unsigned long irq_flags;
+        int err;
+
+        if (!spi->irq) {
+                dev_dbg(&spi->dev, "no IRQ?\n");
+                return -ENODEV;
+        }
+
+        if (!pdata) {
+                dev_dbg(&spi->dev, "no platform data?\n");
+                return -ENODEV;
+        }
+
+        /* don't exceed max specified sample rate */
+        if (spi->max_speed_hz > (125000 * SAMPLE_BITS)) {
+                dev_dbg(&spi->dev, "f(sample) %d KHz?\n",
+                                (spi->max_speed_hz/SAMPLE_BITS)/1000);
+                return -EINVAL;
+        }
+
+        /* We'd set TX word size 8 bits and RX word size to 13 bits ... except
+         * that even if the hardware can do that, the SPI controller driver
+         * may not.  So we stick to very-portable 8 bit words, both RX and TX.
+         */
+        spi->bits_per_word = 8;
+        spi->mode = SPI_MODE_0;
+        err = spi_setup(spi);
+        if (err < 0)
+                return err;
+
+        ts = kzalloc(sizeof(struct ads7846), GFP_KERNEL);
+        packet = kzalloc(sizeof(struct ads7846_packet), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!ts || !packet || !input_dev) {
+                err = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        dev_set_drvdata(&spi->dev, ts);
+
+        ts->packet = packet;
+        ts->spi = spi;
+        ts->input = input_dev;
+        ts->vref_mv = pdata->vref_mv;
+        ts->swap_xy = pdata->swap_xy;
+
+        mutex_init(&ts->lock);
+        init_waitqueue_head(&ts->wait);
+
+        ts->model = pdata->model ? : 7846;
+        ts->vref_delay_usecs = pdata->vref_delay_usecs ? : 100;
+        ts->x_plate_ohms = pdata->x_plate_ohms ? : 400;
+        ts->pressure_max = pdata->pressure_max ? : ~0;
+
+        if (pdata->filter != NULL) {
+                if (pdata->filter_init != NULL) {
+                        err = pdata->filter_init(pdata, &ts->filter_data);
+                        if (err < 0)
+                                goto err_free_mem;
+                }
+                ts->filter = pdata->filter;
+                ts->filter_cleanup = pdata->filter_cleanup;
+        } else if (pdata->debounce_max) {
+                ts->debounce_max = pdata->debounce_max;
+                if (ts->debounce_max < 2)
+                        ts->debounce_max = 2;
+                ts->debounce_tol = pdata->debounce_tol;
+                ts->debounce_rep = pdata->debounce_rep;
+                ts->filter = ads7846_debounce_filter;
+                ts->filter_data = ts;
+        } else {
+                ts->filter = ads7846_no_filter;
+        }
+
+        err = ads7846_setup_pendown(spi, ts);
+        if (err)
+                goto err_cleanup_filter;
+
+        if (pdata->penirq_recheck_delay_usecs)
+                ts->penirq_recheck_delay_usecs =
+                                pdata->penirq_recheck_delay_usecs;
+
+        ts->wait_for_sync = pdata->wait_for_sync ? : null_wait_for_sync;
+
+        snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(&spi->dev));
+        snprintf(ts->name, sizeof(ts->name), "ADS%d Touchscreen", ts->model);
+
+        input_dev->name = ts->name;
+        input_dev->phys = ts->phys;
+        input_dev->dev.parent = &spi->dev;
+
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+        input_set_abs_params(input_dev, ABS_X,
+                        pdata->x_min ? : 0,
+                        pdata->x_max ? : MAX_12BIT,
+                        0, 0);
+        input_set_abs_params(input_dev, ABS_Y,
+                        pdata->y_min ? : 0,
+                        pdata->y_max ? : MAX_12BIT,
+                        0, 0);
+        input_set_abs_params(input_dev, ABS_PRESSURE,
+                        pdata->pressure_min, pdata->pressure_max, 0, 0);
 
-        ts->last_msg = m;
+        ads7846_setup_spi_msg(ts, pdata);
 
         ts->reg = regulator_get(&spi->dev, "vcc");
         if (IS_ERR(ts->reg)) {
@@ -1271,16 +1320,17 @@ static int __devinit ads7846_probe(struct spi_device *spi)
         }
 
         irq_flags = pdata->irq_flags ? : IRQF_TRIGGER_FALLING;
+        irq_flags |= IRQF_ONESHOT;
 
-        err = request_irq(spi->irq, ads7846_irq, irq_flags,
-                          spi->dev.driver->name, ts);
-
+        err = request_threaded_irq(spi->irq, ads7846_hard_irq, ads7846_irq,
+                                   irq_flags, spi->dev.driver->name, ts);
         if (err && !pdata->irq_flags) {
                 dev_info(&spi->dev,
                         "trying pin change workaround on irq %d\n", spi->irq);
-                err = request_irq(spi->irq, ads7846_irq,
-                                  IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
-                                  spi->dev.driver->name, ts);
+                irq_flags |= IRQF_TRIGGER_RISING;
+                err = request_threaded_irq(spi->irq,
+                                  ads7846_hard_irq, ads7846_irq,
+                                  irq_flags, spi->dev.driver->name, ts);
         }
 
         if (err) {
@@ -1294,14 +1344,14 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 
         dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq);
 
-        /* take a first sample, leaving nPENIRQ active and vREF off; avoid
+        /*
+         * Take a first sample, leaving nPENIRQ active and vREF off; avoid
          * the touchscreen, in case it's not connected.
          */
         if (ts->model == 7845)
                 ads7845_read12_ser(&spi->dev, PWRDOWN);
         else
-                (void) ads7846_read12_ser(&spi->dev,
-                                READ_12BIT_SER(vaux) | ADS_PD10_ALL_ON);
+                (void) ads7846_read12_ser(&spi->dev, READ_12BIT_SER(vaux));
 
         err = sysfs_create_group(&spi->dev.kobj, &ads784x_attr_group);
         if (err)
@@ -1326,7 +1376,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
  err_put_regulator:
         regulator_put(ts->reg);
  err_free_gpio:
-        if (ts->gpio_pendown != -1)
+        if (!ts->get_pendown_state)
                 gpio_free(ts->gpio_pendown);
  err_cleanup_filter:
         if (ts->filter_cleanup)
@@ -1340,26 +1390,29 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 
 static int __devexit ads7846_remove(struct spi_device *spi)
 {
-        struct ads7846          *ts = dev_get_drvdata(&spi->dev);
+        struct ads7846 *ts = dev_get_drvdata(&spi->dev);
 
         device_init_wakeup(&spi->dev, false);
 
-        ads784x_hwmon_unregister(spi, ts);
-        input_unregister_device(ts->input);
-
-        ads7846_suspend(spi, PMSG_SUSPEND);
-
         sysfs_remove_group(&spi->dev.kobj, &ads784x_attr_group);
 
+        ads7846_disable(ts);
         free_irq(ts->spi->irq, ts);
-        /* suspend left the IRQ disabled */
-        enable_irq(ts->spi->irq);
+
+        input_unregister_device(ts->input);
+
+        ads784x_hwmon_unregister(spi, ts);
 
         regulator_disable(ts->reg);
         regulator_put(ts->reg);
 
-        if (ts->gpio_pendown != -1)
+        if (!ts->get_pendown_state) {
+                /*
+                 * If we are not using specialized pendown method we must
+                 * have been relying on gpio we set up ourselves.
+                 */
                 gpio_free(ts->gpio_pendown);
+        }
 
         if (ts->filter_cleanup)
                 ts->filter_cleanup(ts->filter_data);
@@ -1368,6 +1421,7 @@ static int __devexit ads7846_remove(struct spi_device *spi)
         kfree(ts);
 
         dev_dbg(&spi->dev, "unregistered touchscreen\n");
+
         return 0;
 }
 
@@ -1376,11 +1430,10 @@ static struct spi_driver ads7846_driver = {
                 .name   = "ads7846",
                 .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
+                .pm     = &ads7846_pm,
         },
         .probe          = ads7846_probe,
         .remove         = __devexit_p(ads7846_remove),
-        .suspend        = ads7846_suspend,
-        .resume         = ads7846_resume,
 };
 
 static int __init ads7846_init(void)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
new file mode 100644
index 000000000000..1e61387c73ca
--- /dev/null
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -0,0 +1,1243 @@
+/*
+ * Atmel maXTouch Touchscreen driver
+ *
+ * Copyright (C) 2010 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.com>
+ *
+ * This program 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.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/firmware.h>
+#include <linux/i2c.h>
+#include <linux/i2c/atmel_mxt_ts.h>
+#include <linux/input/mt.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+
+/* Version */
+#define MXT_VER_20              20
+#define MXT_VER_21              21
+#define MXT_VER_22              22
+
+/* Slave addresses */
+#define MXT_APP_LOW             0x4a
+#define MXT_APP_HIGH            0x4b
+#define MXT_BOOT_LOW            0x24
+#define MXT_BOOT_HIGH           0x25
+
+/* Firmware */
+#define MXT_FW_NAME             "maxtouch.fw"
+
+/* Registers */
+#define MXT_FAMILY_ID           0x00
+#define MXT_VARIANT_ID          0x01
+#define MXT_VERSION             0x02
+#define MXT_BUILD               0x03
+#define MXT_MATRIX_X_SIZE       0x04
+#define MXT_MATRIX_Y_SIZE       0x05
+#define MXT_OBJECT_NUM          0x06
+#define MXT_OBJECT_START        0x07
+
+#define MXT_OBJECT_SIZE         6
+
+/* Object types */
+#define MXT_DEBUG_DIAGNOSTIC    37
+#define MXT_GEN_MESSAGE         5
+#define MXT_GEN_COMMAND         6
+#define MXT_GEN_POWER           7
+#define MXT_GEN_ACQUIRE         8
+#define MXT_TOUCH_MULTI         9
+#define MXT_TOUCH_KEYARRAY      15
+#define MXT_TOUCH_PROXIMITY     23
+#define MXT_PROCI_GRIPFACE      20
+#define MXT_PROCG_NOISE         22
+#define MXT_PROCI_ONETOUCH      24
+#define MXT_PROCI_TWOTOUCH      27
+#define MXT_PROCI_GRIP          40
+#define MXT_PROCI_PALM          41
+#define MXT_SPT_COMMSCONFIG     18
+#define MXT_SPT_GPIOPWM         19
+#define MXT_SPT_SELFTEST        25
+#define MXT_SPT_CTECONFIG       28
+#define MXT_SPT_USERDATA        38
+#define MXT_SPT_DIGITIZER       43
+#define MXT_SPT_MESSAGECOUNT    44
+
+/* MXT_GEN_COMMAND field */
+#define MXT_COMMAND_RESET       0
+#define MXT_COMMAND_BACKUPNV    1
+#define MXT_COMMAND_CALIBRATE   2
+#define MXT_COMMAND_REPORTALL   3
+#define MXT_COMMAND_DIAGNOSTIC  5
+
+/* MXT_GEN_POWER field */
+#define MXT_POWER_IDLEACQINT    0
+#define MXT_POWER_ACTVACQINT    1
+#define MXT_POWER_ACTV2IDLETO   2
+
+/* MXT_GEN_ACQUIRE field */
+#define MXT_ACQUIRE_CHRGTIME    0
+#define MXT_ACQUIRE_TCHDRIFT    2
+#define MXT_ACQUIRE_DRIFTST     3
+#define MXT_ACQUIRE_TCHAUTOCAL  4
+#define MXT_ACQUIRE_SYNC        5
+#define MXT_ACQUIRE_ATCHCALST   6
+#define MXT_ACQUIRE_ATCHCALSTHR 7
+
+/* MXT_TOUCH_MULTI field */
+#define MXT_TOUCH_CTRL          0
+#define MXT_TOUCH_XORIGIN       1
+#define MXT_TOUCH_YORIGIN       2
+#define MXT_TOUCH_XSIZE         3
+#define MXT_TOUCH_YSIZE         4
+#define MXT_TOUCH_BLEN          6
+#define MXT_TOUCH_TCHTHR        7
+#define MXT_TOUCH_TCHDI         8
+#define MXT_TOUCH_ORIENT        9
+#define MXT_TOUCH_MOVHYSTI      11
+#define MXT_TOUCH_MOVHYSTN      12
+#define MXT_TOUCH_NUMTOUCH      14
+#define MXT_TOUCH_MRGHYST       15
+#define MXT_TOUCH_MRGTHR        16
+#define MXT_TOUCH_AMPHYST       17
+#define MXT_TOUCH_XRANGE_LSB    18
+#define MXT_TOUCH_XRANGE_MSB    19
+#define MXT_TOUCH_YRANGE_LSB    20
+#define MXT_TOUCH_YRANGE_MSB    21
+#define MXT_TOUCH_XLOCLIP       22
+#define MXT_TOUCH_XHICLIP       23
+#define MXT_TOUCH_YLOCLIP       24
+#define MXT_TOUCH_YHICLIP       25
+#define MXT_TOUCH_XEDGECTRL     26
+#define MXT_TOUCH_XEDGEDIST     27
+#define MXT_TOUCH_YEDGECTRL     28
+#define MXT_TOUCH_YEDGEDIST     29
+#define MXT_TOUCH_JUMPLIMIT     30
+
+/* MXT_PROCI_GRIPFACE field */
+#define MXT_GRIPFACE_CTRL       0
+#define MXT_GRIPFACE_XLOGRIP    1
+#define MXT_GRIPFACE_XHIGRIP    2
+#define MXT_GRIPFACE_YLOGRIP    3
+#define MXT_GRIPFACE_YHIGRIP    4
+#define MXT_GRIPFACE_MAXTCHS    5
+#define MXT_GRIPFACE_SZTHR1     7
+#define MXT_GRIPFACE_SZTHR2     8
+#define MXT_GRIPFACE_SHPTHR1    9
+#define MXT_GRIPFACE_SHPTHR2    10
+#define MXT_GRIPFACE_SUPEXTTO   11
+
+/* MXT_PROCI_NOISE field */
+#define MXT_NOISE_CTRL          0
+#define MXT_NOISE_OUTFLEN       1
+#define MXT_NOISE_GCAFUL_LSB    3
+#define MXT_NOISE_GCAFUL_MSB    4
+#define MXT_NOISE_GCAFLL_LSB    5
+#define MXT_NOISE_GCAFLL_MSB    6
+#define MXT_NOISE_ACTVGCAFVALID 7
+#define MXT_NOISE_NOISETHR      8
+#define MXT_NOISE_FREQHOPSCALE  10
+#define MXT_NOISE_FREQ0         11
+#define MXT_NOISE_FREQ1         12
+#define MXT_NOISE_FREQ2         13
+#define MXT_NOISE_FREQ3         14
+#define MXT_NOISE_FREQ4         15
+#define MXT_NOISE_IDLEGCAFVALID 16
+
+/* MXT_SPT_COMMSCONFIG */
+#define MXT_COMMS_CTRL          0
+#define MXT_COMMS_CMD           1
+
+/* MXT_SPT_CTECONFIG field */
+#define MXT_CTE_CTRL            0
+#define MXT_CTE_CMD             1
+#define MXT_CTE_MODE            2
+#define MXT_CTE_IDLEGCAFDEPTH   3
+#define MXT_CTE_ACTVGCAFDEPTH   4
+#define MXT_CTE_VOLTAGE         5
+
+#define MXT_VOLTAGE_DEFAULT     2700000
+#define MXT_VOLTAGE_STEP        10000
+
+/* Define for MXT_GEN_COMMAND */
+#define MXT_BOOT_VALUE          0xa5
+#define MXT_BACKUP_VALUE        0x55
+#define MXT_BACKUP_TIME         25      /* msec */
+#define MXT_RESET_TIME          65      /* msec */
+
+#define MXT_FWRESET_TIME        175     /* msec */
+
+/* Command to unlock bootloader */
+#define MXT_UNLOCK_CMD_MSB      0xaa
+#define MXT_UNLOCK_CMD_LSB      0xdc
+
+/* Bootloader mode status */
+#define MXT_WAITING_BOOTLOAD_CMD        0xc0    /* valid 7 6 bit only */
+#define MXT_WAITING_FRAME_DATA  0x80    /* valid 7 6 bit only */
+#define MXT_FRAME_CRC_CHECK     0x02
+#define MXT_FRAME_CRC_FAIL      0x03
+#define MXT_FRAME_CRC_PASS      0x04
+#define MXT_APP_CRC_FAIL        0x40    /* valid 7 8 bit only */
+#define MXT_BOOT_STATUS_MASK    0x3f
+
+/* Touch status */
+#define MXT_SUPPRESS            (1 << 1)
+#define MXT_AMP                 (1 << 2)
+#define MXT_VECTOR              (1 << 3)
+#define MXT_MOVE                (1 << 4)
+#define MXT_RELEASE             (1 << 5)
+#define MXT_PRESS               (1 << 6)
+#define MXT_DETECT              (1 << 7)
+
+/* Touch orient bits */
+#define MXT_XY_SWITCH           (1 << 0)
+#define MXT_X_INVERT            (1 << 1)
+#define MXT_Y_INVERT            (1 << 2)
+
+/* Touchscreen absolute values */
+#define MXT_MAX_AREA            0xff
+
+#define MXT_MAX_FINGER          10
+
+struct mxt_info {
+        u8 family_id;
+        u8 variant_id;
+        u8 version;
+        u8 build;
+        u8 matrix_xsize;
+        u8 matrix_ysize;
+        u8 object_num;
+};
+
+struct mxt_object {
+        u8 type;
+        u16 start_address;
+        u8 size;
+        u8 instances;
+        u8 num_report_ids;
+
+        /* to map object and message */
+        u8 max_reportid;
+};
+
+struct mxt_message {
+        u8 reportid;
+        u8 message[7];
+        u8 checksum;
+};
+
+struct mxt_finger {
+        int status;
+        int x;
+        int y;
+        int area;
+};
+
+/* Each client has this additional data */
+struct mxt_data {
+        struct i2c_client *client;
+        struct input_dev *input_dev;
+        const struct mxt_platform_data *pdata;
+        struct mxt_object *object_table;
+        struct mxt_info info;
+        struct mxt_finger finger[MXT_MAX_FINGER];
+        unsigned int irq;
+        unsigned int max_x;
+        unsigned int max_y;
+};
+
+static bool mxt_object_readable(unsigned int type)
+{
+        switch (type) {
+        case MXT_GEN_MESSAGE:
+        case MXT_GEN_COMMAND:
+        case MXT_GEN_POWER:
+        case MXT_GEN_ACQUIRE:
+        case MXT_TOUCH_MULTI:
+        case MXT_TOUCH_KEYARRAY:
+        case MXT_TOUCH_PROXIMITY:
+        case MXT_PROCI_GRIPFACE:
+        case MXT_PROCG_NOISE:
+        case MXT_PROCI_ONETOUCH:
+        case MXT_PROCI_TWOTOUCH:
+        case MXT_PROCI_GRIP:
+        case MXT_PROCI_PALM:
+        case MXT_SPT_COMMSCONFIG:
+        case MXT_SPT_GPIOPWM:
+        case MXT_SPT_SELFTEST:
+        case MXT_SPT_CTECONFIG:
+        case MXT_SPT_USERDATA:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static bool mxt_object_writable(unsigned int type)
+{
+        switch (type) {
+        case MXT_GEN_COMMAND:
+        case MXT_GEN_POWER:
+        case MXT_GEN_ACQUIRE:
+        case MXT_TOUCH_MULTI:
+        case MXT_TOUCH_KEYARRAY:
+        case MXT_TOUCH_PROXIMITY:
+        case MXT_PROCI_GRIPFACE:
+        case MXT_PROCG_NOISE:
+        case MXT_PROCI_ONETOUCH:
+        case MXT_PROCI_TWOTOUCH:
+        case MXT_PROCI_GRIP:
+        case MXT_PROCI_PALM:
+        case MXT_SPT_GPIOPWM:
+        case MXT_SPT_SELFTEST:
+        case MXT_SPT_CTECONFIG:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static void mxt_dump_message(struct device *dev,
+                                  struct mxt_message *message)
+{
+        dev_dbg(dev, "reportid:\t0x%x\n", message->reportid);
+        dev_dbg(dev, "message1:\t0x%x\n", message->message[0]);
+        dev_dbg(dev, "message2:\t0x%x\n", message->message[1]);
+        dev_dbg(dev, "message3:\t0x%x\n", message->message[2]);
+        dev_dbg(dev, "message4:\t0x%x\n", message->message[3]);
+        dev_dbg(dev, "message5:\t0x%x\n", message->message[4]);
+        dev_dbg(dev, "message6:\t0x%x\n", message->message[5]);
+        dev_dbg(dev, "message7:\t0x%x\n", message->message[6]);
+        dev_dbg(dev, "checksum:\t0x%x\n", message->checksum);
+}
+
+static int mxt_check_bootloader(struct i2c_client *client,
+                                     unsigned int state)
+{
+        u8 val;
+
+recheck:
+        if (i2c_master_recv(client, &val, 1) != 1) {
+                dev_err(&client->dev, "%s: i2c recv failed\n", __func__);
+                return -EIO;
+        }
+
+        switch (state) {
+        case MXT_WAITING_BOOTLOAD_CMD:
+        case MXT_WAITING_FRAME_DATA:
+                val &= ~MXT_BOOT_STATUS_MASK;
+                break;
+        case MXT_FRAME_CRC_PASS:
+                if (val == MXT_FRAME_CRC_CHECK)
+                        goto recheck;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (val != state) {
+                dev_err(&client->dev, "Unvalid bootloader mode state\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int mxt_unlock_bootloader(struct i2c_client *client)
+{
+        u8 buf[2];
+
+        buf[0] = MXT_UNLOCK_CMD_LSB;
+        buf[1] = MXT_UNLOCK_CMD_MSB;
+
+        if (i2c_master_send(client, buf, 2) != 2) {
+                dev_err(&client->dev, "%s: i2c send failed\n", __func__);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int mxt_fw_write(struct i2c_client *client,
+                             const u8 *data, unsigned int frame_size)
+{
+        if (i2c_master_send(client, data, frame_size) != frame_size) {
+                dev_err(&client->dev, "%s: i2c send failed\n", __func__);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int __mxt_read_reg(struct i2c_client *client,
+                               u16 reg, u16 len, void *val)
+{
+        struct i2c_msg xfer[2];
+        u8 buf[2];
+
+        buf[0] = reg & 0xff;
+        buf[1] = (reg >> 8) & 0xff;
+
+        /* Write register */
+        xfer[0].addr = client->addr;
+        xfer[0].flags = 0;
+        xfer[0].len = 2;
+        xfer[0].buf = buf;
+
+        /* Read data */
+        xfer[1].addr = client->addr;
+        xfer[1].flags = I2C_M_RD;
+        xfer[1].len = len;
+        xfer[1].buf = val;
+
+        if (i2c_transfer(client->adapter, xfer, 2) != 2) {
+                dev_err(&client->dev, "%s: i2c transfer failed\n", __func__);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int mxt_read_reg(struct i2c_client *client, u16 reg, u8 *val)
+{
+        return __mxt_read_reg(client, reg, 1, val);
+}
+
+static int mxt_write_reg(struct i2c_client *client, u16 reg, u8 val)
+{
+        u8 buf[3];
+
+        buf[0] = reg & 0xff;
+        buf[1] = (reg >> 8) & 0xff;
+        buf[2] = val;
+
+        if (i2c_master_send(client, buf, 3) != 3) {
+                dev_err(&client->dev, "%s: i2c send failed\n", __func__);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int mxt_read_object_table(struct i2c_client *client,
+                                      u16 reg, u8 *object_buf)
+{
+        return __mxt_read_reg(client, reg, MXT_OBJECT_SIZE,
+                                   object_buf);
+}
+
+static struct mxt_object *
+mxt_get_object(struct mxt_data *data, u8 type)
+{
+        struct mxt_object *object;
+        int i;
+
+        for (i = 0; i < data->info.object_num; i++) {
+                object = data->object_table + i;
+                if (object->type == type)
+                        return object;
+        }
+
+        dev_err(&data->client->dev, "Invalid object type\n");
+        return NULL;
+}
+
+static int mxt_read_message(struct mxt_data *data,
+                                 struct mxt_message *message)
+{
+        struct mxt_object *object;
+        u16 reg;
+
+        object = mxt_get_object(data, MXT_GEN_MESSAGE);
+        if (!object)
+                return -EINVAL;
+
+        reg = object->start_address;
+        return __mxt_read_reg(data->client, reg,
+                        sizeof(struct mxt_message), message);
+}
+
+static int mxt_read_object(struct mxt_data *data,
+                                u8 type, u8 offset, u8 *val)
+{
+        struct mxt_object *object;
+        u16 reg;
+
+        object = mxt_get_object(data, type);
+        if (!object)
+                return -EINVAL;
+
+        reg = object->start_address;
+        return __mxt_read_reg(data->client, reg + offset, 1, val);
+}
+
+static int mxt_write_object(struct mxt_data *data,
+                                 u8 type, u8 offset, u8 val)
+{
+        struct mxt_object *object;
+        u16 reg;
+
+        object = mxt_get_object(data, type);
+        if (!object)
+                return -EINVAL;
+
+        reg = object->start_address;
+        return mxt_write_reg(data->client, reg + offset, val);
+}
+
+static void mxt_input_report(struct mxt_data *data, int single_id)
+{
+        struct mxt_finger *finger = data->finger;
+        struct input_dev *input_dev = data->input_dev;
+        int status = finger[single_id].status;
+        int finger_num = 0;
+        int id;
+
+        for (id = 0; id < MXT_MAX_FINGER; id++) {
+                if (!finger[id].status)
+                        continue;
+
+                input_mt_slot(input_dev, id);
+                input_mt_report_slot_state(input_dev, MT_TOOL_FINGER,
+                                finger[id].status != MXT_RELEASE);
+
+                if (finger[id].status != MXT_RELEASE) {
+                        finger_num++;
+                        input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR,
+                                        finger[id].area);
+                        input_report_abs(input_dev, ABS_MT_POSITION_X,
+                                        finger[id].x);
+                        input_report_abs(input_dev, ABS_MT_POSITION_Y,
+                                        finger[id].y);
+                } else {
+                        finger[id].status = 0;
+                }
+        }
+
+        input_report_key(input_dev, BTN_TOUCH, finger_num > 0);
+
+        if (status != MXT_RELEASE) {
+                input_report_abs(input_dev, ABS_X, finger[single_id].x);
+                input_report_abs(input_dev, ABS_Y, finger[single_id].y);
+        }
+
+        input_sync(input_dev);
+}
+
+static void mxt_input_touchevent(struct mxt_data *data,
+                                      struct mxt_message *message, int id)
+{
+        struct mxt_finger *finger = data->finger;
+        struct device *dev = &data->client->dev;
+        u8 status = message->message[0];
+        int x;
+        int y;
+        int area;
+
+        /* Check the touch is present on the screen */
+        if (!(status & MXT_DETECT)) {
+                if (status & MXT_RELEASE) {
+                        dev_dbg(dev, "[%d] released\n", id);
+
+                        finger[id].status = MXT_RELEASE;
+                        mxt_input_report(data, id);
+                }
+                return;
+        }
+
+        /* Check only AMP detection */
+        if (!(status & (MXT_PRESS | MXT_MOVE)))
+                return;
+
+        x = (message->message[1] << 4) | ((message->message[3] >> 4) & 0xf);
+        y = (message->message[2] << 4) | ((message->message[3] & 0xf));
+        if (data->max_x < 1024)
+                x = x >> 2;
+        if (data->max_y < 1024)
+                y = y >> 2;
+
+        area = message->message[4];
+
+        dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id,
+                status & MXT_MOVE ? "moved" : "pressed",
+                x, y, area);
+
+        finger[id].status = status & MXT_MOVE ?
+                                MXT_MOVE : MXT_PRESS;
+        finger[id].x = x;
+        finger[id].y = y;
+        finger[id].area = area;
+
+        mxt_input_report(data, id);
+}
+
+static irqreturn_t mxt_interrupt(int irq, void *dev_id)
+{
+        struct mxt_data *data = dev_id;
+        struct mxt_message message;
+        struct mxt_object *object;
+        struct device *dev = &data->client->dev;
+        int id;
+        u8 reportid;
+        u8 max_reportid;
+        u8 min_reportid;
+
+        do {
+                if (mxt_read_message(data, &message)) {
+                        dev_err(dev, "Failed to read message\n");
+                        goto end;
+                }
+
+                reportid = message.reportid;
+
+                /* whether reportid is thing of MXT_TOUCH_MULTI */
+                object = mxt_get_object(data, MXT_TOUCH_MULTI);
+                if (!object)
+                        goto end;
+
+                max_reportid = object->max_reportid;
+                min_reportid = max_reportid - object->num_report_ids + 1;
+                id = reportid - min_reportid;
+
+                if (reportid >= min_reportid && reportid <= max_reportid)
+                        mxt_input_touchevent(data, &message, id);
+                else
+                        mxt_dump_message(dev, &message);
+        } while (reportid != 0xff);
+
+end:
+        return IRQ_HANDLED;
+}
+
+static int mxt_check_reg_init(struct mxt_data *data)
+{
+        const struct mxt_platform_data *pdata = data->pdata;
+        struct mxt_object *object;
+        struct device *dev = &data->client->dev;
+        int index = 0;
+        int i, j, config_offset;
+
+        if (!pdata->config) {
+                dev_dbg(dev, "No cfg data defined, skipping reg init\n");
+                return 0;
+        }
+
+        for (i = 0; i < data->info.object_num; i++) {
+                object = data->object_table + i;
+
+                if (!mxt_object_writable(object->type))
+                        continue;
+
+                for (j = 0; j < object->size + 1; j++) {
+                        config_offset = index + j;
+                        if (config_offset > pdata->config_length) {
+                                dev_err(dev, "Not enough config data!\n");
+                                return -EINVAL;
+                        }
+                        mxt_write_object(data, object->type, j,
+                                         pdata->config[config_offset]);
+                }
+                index += object->size + 1;
+        }
+
+        return 0;
+}
+
+static int mxt_make_highchg(struct mxt_data *data)
+{
+        struct device *dev = &data->client->dev;
+        struct mxt_message message;
+        int count = 10;
+        int error;
+
+        /* Read dummy message to make high CHG pin */
+        do {
+                error = mxt_read_message(data, &message);
+                if (error)
+                        return error;
+        } while (message.reportid != 0xff && --count);
+
+        if (!count) {
+                dev_err(dev, "CHG pin isn't cleared\n");
+                return -EBUSY;
+        }
+
+        return 0;
+}
+
+static void mxt_handle_pdata(struct mxt_data *data)
+{
+        const struct mxt_platform_data *pdata = data->pdata;
+        u8 voltage;
+
+        /* Set touchscreen lines */
+        mxt_write_object(data, MXT_TOUCH_MULTI, MXT_TOUCH_XSIZE,
+                        pdata->x_line);
+        mxt_write_object(data, MXT_TOUCH_MULTI, MXT_TOUCH_YSIZE,
+                        pdata->y_line);
+
+        /* Set touchscreen orient */
+        mxt_write_object(data, MXT_TOUCH_MULTI, MXT_TOUCH_ORIENT,
+                        pdata->orient);
+
+        /* Set touchscreen burst length */
+        mxt_write_object(data, MXT_TOUCH_MULTI,
+                        MXT_TOUCH_BLEN, pdata->blen);
+
+        /* Set touchscreen threshold */
+        mxt_write_object(data, MXT_TOUCH_MULTI,
+                        MXT_TOUCH_TCHTHR, pdata->threshold);
+
+        /* Set touchscreen resolution */
+        mxt_write_object(data, MXT_TOUCH_MULTI,
+                        MXT_TOUCH_XRANGE_LSB, (pdata->x_size - 1) & 0xff);
+        mxt_write_object(data, MXT_TOUCH_MULTI,
+                        MXT_TOUCH_XRANGE_MSB, (pdata->x_size - 1) >> 8);
+        mxt_write_object(data, MXT_TOUCH_MULTI,
+                        MXT_TOUCH_YRANGE_LSB, (pdata->y_size - 1) & 0xff);
+        mxt_write_object(data, MXT_TOUCH_MULTI,
+                        MXT_TOUCH_YRANGE_MSB, (pdata->y_size - 1) >> 8);
+
+        /* Set touchscreen voltage */
+        if (pdata->voltage) {
+                if (pdata->voltage < MXT_VOLTAGE_DEFAULT) {
+                        voltage = (MXT_VOLTAGE_DEFAULT - pdata->voltage) /
+                                MXT_VOLTAGE_STEP;
+                        voltage = 0xff - voltage + 1;
+                } else
+                        voltage = (pdata->voltage - MXT_VOLTAGE_DEFAULT) /
+                                MXT_VOLTAGE_STEP;
+
+                mxt_write_object(data, MXT_SPT_CTECONFIG,
+                                MXT_CTE_VOLTAGE, voltage);
+        }
+}
+
+static int mxt_get_info(struct mxt_data *data)
+{
+        struct i2c_client *client = data->client;
+        struct mxt_info *info = &data->info;
+        int error;
+        u8 val;
+
+        error = mxt_read_reg(client, MXT_FAMILY_ID, &val);
+        if (error)
+                return error;
+        info->family_id = val;
+
+        error = mxt_read_reg(client, MXT_VARIANT_ID, &val);
+        if (error)
+                return error;
+        info->variant_id = val;
+
+        error = mxt_read_reg(client, MXT_VERSION, &val);
+        if (error)
+                return error;
+        info->version = val;
+
+        error = mxt_read_reg(client, MXT_BUILD, &val);
+        if (error)
+                return error;
+        info->build = val;
+
+        error = mxt_read_reg(client, MXT_OBJECT_NUM, &val);
+        if (error)
+                return error;
+        info->object_num = val;
+
+        return 0;
+}
+
+static int mxt_get_object_table(struct mxt_data *data)
+{
+        int error;
+        int i;
+        u16 reg;
+        u8 reportid = 0;
+        u8 buf[MXT_OBJECT_SIZE];
+
+        for (i = 0; i < data->info.object_num; i++) {
+                struct mxt_object *object = data->object_table + i;
+
+                reg = MXT_OBJECT_START + MXT_OBJECT_SIZE * i;
+                error = mxt_read_object_table(data->client, reg, buf);
+                if (error)
+                        return error;
+
+                object->type = buf[0];
+                object->start_address = (buf[2] << 8) | buf[1];
+                object->size = buf[3];
+                object->instances = buf[4];
+                object->num_report_ids = buf[5];
+
+                if (object->num_report_ids) {
+                        reportid += object->num_report_ids *
+                                        (object->instances + 1);
+                        object->max_reportid = reportid;
+                }
+        }
+
+        return 0;
+}
+
+static int mxt_initialize(struct mxt_data *data)
+{
+        struct i2c_client *client = data->client;
+        struct mxt_info *info = &data->info;
+        int error;
+        u8 val;
+
+        error = mxt_get_info(data);
+        if (error)
+                return error;
+
+        data->object_table = kcalloc(info->object_num,
+                                     sizeof(struct mxt_object),
+                                     GFP_KERNEL);
+        if (!data->object_table) {
+                dev_err(&client->dev, "Failed to allocate memory\n");
+                return -ENOMEM;
+        }
+
+        /* Get object table information */
+        error = mxt_get_object_table(data);
+        if (error)
+                return error;
+
+        /* Check register init values */
+        error = mxt_check_reg_init(data);
+        if (error)
+                return error;
+
+        mxt_handle_pdata(data);
+
+        /* Backup to memory */
+        mxt_write_object(data, MXT_GEN_COMMAND,
+                        MXT_COMMAND_BACKUPNV,
+                        MXT_BACKUP_VALUE);
+        msleep(MXT_BACKUP_TIME);
+
+        /* Soft reset */
+        mxt_write_object(data, MXT_GEN_COMMAND,
+                        MXT_COMMAND_RESET, 1);
+        msleep(MXT_RESET_TIME);
+
+        /* Update matrix size at info struct */
+        error = mxt_read_reg(client, MXT_MATRIX_X_SIZE, &val);
+        if (error)
+                return error;
+        info->matrix_xsize = val;
+
+        error = mxt_read_reg(client, MXT_MATRIX_Y_SIZE, &val);
+        if (error)
+                return error;
+        info->matrix_ysize = val;
+
+        dev_info(&client->dev,
+                        "Family ID: %d Variant ID: %d Version: %d Build: %d\n",
+                        info->family_id, info->variant_id, info->version,
+                        info->build);
+
+        dev_info(&client->dev,
+                        "Matrix X Size: %d Matrix Y Size: %d Object Num: %d\n",
+                        info->matrix_xsize, info->matrix_ysize,
+                        info->object_num);
+
+        return 0;
+}
+
+static void mxt_calc_resolution(struct mxt_data *data)
+{
+        unsigned int max_x = data->pdata->x_size - 1;
+        unsigned int max_y = data->pdata->y_size - 1;
+
+        if (data->pdata->orient & MXT_XY_SWITCH) {
+                data->max_x = max_y;
+                data->max_y = max_x;
+        } else {
+                data->max_x = max_x;
+                data->max_y = max_y;
+        }
+}
+
+static ssize_t mxt_object_show(struct device *dev,
+                                    struct device_attribute *attr, char *buf)
+{
+        struct mxt_data *data = dev_get_drvdata(dev);
+        struct mxt_object *object;
+        int count = 0;
+        int i, j;
+        int error;
+        u8 val;
+
+        for (i = 0; i < data->info.object_num; i++) {
+                object = data->object_table + i;
+
+                count += sprintf(buf + count,
+                                "Object Table Element %d(Type %d)\n",
+                                i + 1, object->type);
+
+                if (!mxt_object_readable(object->type)) {
+                        count += sprintf(buf + count, "\n");
+                        continue;
+                }
+
+                for (j = 0; j < object->size + 1; j++) {
+                        error = mxt_read_object(data,
+                                                object->type, j, &val);
+                        if (error)
+                                return error;
+
+                        count += sprintf(buf + count,
+                                        "  Byte %d: 0x%x (%d)\n", j, val, val);
+                }
+
+                count += sprintf(buf + count, "\n");
+        }
+
+        return count;
+}
+
+static int mxt_load_fw(struct device *dev, const char *fn)
+{
+        struct mxt_data *data = dev_get_drvdata(dev);
+        struct i2c_client *client = data->client;
+        const struct firmware *fw = NULL;
+        unsigned int frame_size;
+        unsigned int pos = 0;
+        int ret;
+
+        ret = request_firmware(&fw, fn, dev);
+        if (ret) {
+                dev_err(dev, "Unable to open firmware %s\n", fn);
+                return ret;
+        }
+
+        /* Change to the bootloader mode */
+        mxt_write_object(data, MXT_GEN_COMMAND,
+                        MXT_COMMAND_RESET, MXT_BOOT_VALUE);
+        msleep(MXT_RESET_TIME);
+
+        /* Change to slave address of bootloader */
+        if (client->addr == MXT_APP_LOW)
+                client->addr = MXT_BOOT_LOW;
+        else
+                client->addr = MXT_BOOT_HIGH;
+
+        ret = mxt_check_bootloader(client, MXT_WAITING_BOOTLOAD_CMD);
+        if (ret)
+                goto out;
+
+        /* Unlock bootloader */
+        mxt_unlock_bootloader(client);
+
+        while (pos < fw->size) {
+                ret = mxt_check_bootloader(client,
+                                                MXT_WAITING_FRAME_DATA);
+                if (ret)
+                        goto out;
+
+                frame_size = ((*(fw->data + pos) << 8) | *(fw->data + pos + 1));
+
+                /* We should add 2 at frame size as the the firmware data is not
+                 * included the CRC bytes.
+                 */
+                frame_size += 2;
+
+                /* Write one frame to device */
+                mxt_fw_write(client, fw->data + pos, frame_size);
+
+                ret = mxt_check_bootloader(client,
+                                                MXT_FRAME_CRC_PASS);
+                if (ret)
+                        goto out;
+
+                pos += frame_size;
+
+                dev_dbg(dev, "Updated %d bytes / %zd bytes\n", pos, fw->size);
+        }
+
+out:
+        release_firmware(fw);
+
+        /* Change to slave address of application */
+        if (client->addr == MXT_BOOT_LOW)
+                client->addr = MXT_APP_LOW;
+        else
+                client->addr = MXT_APP_HIGH;
+
+        return ret;
+}
+
+static ssize_t mxt_update_fw_store(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t count)
+{
+        struct mxt_data *data = dev_get_drvdata(dev);
+        int error;
+
+        disable_irq(data->irq);
+
+        error = mxt_load_fw(dev, MXT_FW_NAME);
+        if (error) {
+                dev_err(dev, "The firmware update failed(%d)\n", error);
+                count = error;
+        } else {
+                dev_dbg(dev, "The firmware update succeeded\n");
+
+                /* Wait for reset */
+                msleep(MXT_FWRESET_TIME);
+
+                kfree(data->object_table);
+                data->object_table = NULL;
+
+                mxt_initialize(data);
+        }
+
+        enable_irq(data->irq);
+
+        error = mxt_make_highchg(data);
+        if (error)
+                return error;
+
+        return count;
+}
+
+static DEVICE_ATTR(object, 0444, mxt_object_show, NULL);
+static DEVICE_ATTR(update_fw, 0664, NULL, mxt_update_fw_store);
+
+static struct attribute *mxt_attrs[] = {
+        &dev_attr_object.attr,
+        &dev_attr_update_fw.attr,
+        NULL
+};
+
+static const struct attribute_group mxt_attr_group = {
+        .attrs = mxt_attrs,
+};
+
+static void mxt_start(struct mxt_data *data)
+{
+        /* Touch enable */
+        mxt_write_object(data,
+                        MXT_TOUCH_MULTI, MXT_TOUCH_CTRL, 0x83);
+}
+
+static void mxt_stop(struct mxt_data *data)
+{
+        /* Touch disable */
+        mxt_write_object(data,
+                        MXT_TOUCH_MULTI, MXT_TOUCH_CTRL, 0);
+}
+
+static int mxt_input_open(struct input_dev *dev)
+{
+        struct mxt_data *data = input_get_drvdata(dev);
+
+        mxt_start(data);
+
+        return 0;
+}
+
+static void mxt_input_close(struct input_dev *dev)
+{
+        struct mxt_data *data = input_get_drvdata(dev);
+
+        mxt_stop(data);
+}
+
+static int __devinit mxt_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        const struct mxt_platform_data *pdata = client->dev.platform_data;
+        struct mxt_data *data;
+        struct input_dev *input_dev;
+        int error;
+
+        if (!pdata)
+                return -EINVAL;
+
+        data = kzalloc(sizeof(struct mxt_data), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!data || !input_dev) {
+                dev_err(&client->dev, "Failed to allocate memory\n");
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        input_dev->name = "Atmel maXTouch Touchscreen";
+        input_dev->id.bustype = BUS_I2C;
+        input_dev->dev.parent = &client->dev;
+        input_dev->open = mxt_input_open;
+        input_dev->close = mxt_input_close;
+
+        data->client = client;
+        data->input_dev = input_dev;
+        data->pdata = pdata;
+        data->irq = client->irq;
+
+        mxt_calc_resolution(data);
+
+        __set_bit(EV_ABS, input_dev->evbit);
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(BTN_TOUCH, input_dev->keybit);
+
+        /* For single touch */
+        input_set_abs_params(input_dev, ABS_X,
+                             0, data->max_x, 0, 0);
+        input_set_abs_params(input_dev, ABS_Y,
+                             0, data->max_y, 0, 0);
+
+        /* For multi touch */
+        input_mt_init_slots(input_dev, MXT_MAX_FINGER);
+        input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
+                             0, MXT_MAX_AREA, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_POSITION_X,
+                             0, data->max_x, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
+                             0, data->max_y, 0, 0);
+
+        input_set_drvdata(input_dev, data);
+        i2c_set_clientdata(client, data);
+
+        error = mxt_initialize(data);
+        if (error)
+                goto err_free_object;
+
+        error = request_threaded_irq(client->irq, NULL, mxt_interrupt,
+                        pdata->irqflags, client->dev.driver->name, data);
+        if (error) {
+                dev_err(&client->dev, "Failed to register interrupt\n");
+                goto err_free_object;
+        }
+
+        error = mxt_make_highchg(data);
+        if (error)
+                goto err_free_irq;
+
+        error = input_register_device(input_dev);
+        if (error)
+                goto err_free_irq;
+
+        error = sysfs_create_group(&client->dev.kobj, &mxt_attr_group);
+        if (error)
+                goto err_unregister_device;
+
+        return 0;
+
+err_unregister_device:
+        input_unregister_device(input_dev);
+        input_dev = NULL;
+err_free_irq:
+        free_irq(client->irq, data);
+err_free_object:
+        kfree(data->object_table);
+err_free_mem:
+        input_free_device(input_dev);
+        kfree(data);
+        return error;
+}
+
+static int __devexit mxt_remove(struct i2c_client *client)
+{
+        struct mxt_data *data = i2c_get_clientdata(client);
+
+        sysfs_remove_group(&client->dev.kobj, &mxt_attr_group);
+        free_irq(data->irq, data);
+        input_unregister_device(data->input_dev);
+        kfree(data->object_table);
+        kfree(data);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int mxt_suspend(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct mxt_data *data = i2c_get_clientdata(client);
+        struct input_dev *input_dev = data->input_dev;
+
+        mutex_lock(&input_dev->mutex);
+
+        if (input_dev->users)
+                mxt_stop(data);
+
+        mutex_unlock(&input_dev->mutex);
+
+        return 0;
+}
+
+static int mxt_resume(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct mxt_data *data = i2c_get_clientdata(client);
+        struct input_dev *input_dev = data->input_dev;
+
+        /* Soft reset */
+        mxt_write_object(data, MXT_GEN_COMMAND,
+                        MXT_COMMAND_RESET, 1);
+
+        msleep(MXT_RESET_TIME);
+
+        mutex_lock(&input_dev->mutex);
+
+        if (input_dev->users)
+                mxt_start(data);
+
+        mutex_unlock(&input_dev->mutex);
+
+        return 0;
+}
+
+static const struct dev_pm_ops mxt_pm_ops = {
+        .suspend        = mxt_suspend,
+        .resume         = mxt_resume,
+};
+#endif
+
+static const struct i2c_device_id mxt_id[] = {
+        { "qt602240_ts", 0 },
+        { "atmel_mxt_ts", 0 },
+        { "mXT224", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, mxt_id);
+
+static struct i2c_driver mxt_driver = {
+        .driver = {
+                .name   = "atmel_mxt_ts",
+                .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     = &mxt_pm_ops,
+#endif
+        },
+        .probe          = mxt_probe,
+        .remove         = __devexit_p(mxt_remove),
+        .id_table       = mxt_id,
+};
+
+static int __init mxt_init(void)
+{
+        return i2c_add_driver(&mxt_driver);
+}
+
+static void __exit mxt_exit(void)
+{
+        i2c_del_driver(&mxt_driver);
+}
+
+module_init(mxt_init);
+module_exit(mxt_exit);
+
+/* Module information */
+MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>");
+MODULE_DESCRIPTION("Atmel maXTouch Touchscreen driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/atmel_tsadcc.c b/drivers/input/touchscreen/atmel_tsadcc.c
index 3d9b5166ebe9..432c69be6ac6 100644
--- a/drivers/input/touchscreen/atmel_tsadcc.c
+++ b/drivers/input/touchscreen/atmel_tsadcc.c
@@ -317,7 +317,7 @@ err_unmap_regs:
 err_release_mem:
         release_mem_region(res->start, resource_size(res));
 err_free_dev:
-        input_free_device(ts_dev->input);
+        input_free_device(input_dev);
 err_free_mem:
         kfree(ts_dev);
         return err;
diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c
new file mode 100644
index 000000000000..1507ce108d5b
--- /dev/null
+++ b/drivers/input/touchscreen/bu21013_ts.c
@@ -0,0 +1,681 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ * Author: Naveen Kumar G <naveen.gaddipati@stericsson.com> for ST-Ericsson
+ * License terms:GNU General Public License (GPL) version 2
+ */
+
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/i2c.h>
+#include <linux/workqueue.h>
+#include <linux/input.h>
+#include <linux/input/bu21013.h>
+#include <linux/slab.h>
+#include <linux/regulator/consumer.h>
+
+#define PEN_DOWN_INTR   0
+#define MAX_FINGERS     2
+#define RESET_DELAY     30
+#define PENUP_TIMEOUT   (10)
+#define DELTA_MIN       16
+#define MASK_BITS       0x03
+#define SHIFT_8         8
+#define SHIFT_2         2
+#define LENGTH_OF_BUFFER        11
+#define I2C_RETRY_COUNT 5
+
+#define BU21013_SENSORS_BTN_0_7_REG     0x70
+#define BU21013_SENSORS_BTN_8_15_REG    0x71
+#define BU21013_SENSORS_BTN_16_23_REG   0x72
+#define BU21013_X1_POS_MSB_REG          0x73
+#define BU21013_X1_POS_LSB_REG          0x74
+#define BU21013_Y1_POS_MSB_REG          0x75
+#define BU21013_Y1_POS_LSB_REG          0x76
+#define BU21013_X2_POS_MSB_REG          0x77
+#define BU21013_X2_POS_LSB_REG          0x78
+#define BU21013_Y2_POS_MSB_REG          0x79
+#define BU21013_Y2_POS_LSB_REG          0x7A
+#define BU21013_INT_CLR_REG             0xE8
+#define BU21013_INT_MODE_REG            0xE9
+#define BU21013_GAIN_REG                0xEA
+#define BU21013_OFFSET_MODE_REG         0xEB
+#define BU21013_XY_EDGE_REG             0xEC
+#define BU21013_RESET_REG               0xED
+#define BU21013_CALIB_REG               0xEE
+#define BU21013_DONE_REG                0xEF
+#define BU21013_SENSOR_0_7_REG          0xF0
+#define BU21013_SENSOR_8_15_REG         0xF1
+#define BU21013_SENSOR_16_23_REG        0xF2
+#define BU21013_POS_MODE1_REG           0xF3
+#define BU21013_POS_MODE2_REG           0xF4
+#define BU21013_CLK_MODE_REG            0xF5
+#define BU21013_IDLE_REG                0xFA
+#define BU21013_FILTER_REG              0xFB
+#define BU21013_TH_ON_REG               0xFC
+#define BU21013_TH_OFF_REG              0xFD
+
+
+#define BU21013_RESET_ENABLE            0x01
+
+#define BU21013_SENSORS_EN_0_7          0x3F
+#define BU21013_SENSORS_EN_8_15         0xFC
+#define BU21013_SENSORS_EN_16_23        0x1F
+
+#define BU21013_POS_MODE1_0             0x02
+#define BU21013_POS_MODE1_1             0x04
+#define BU21013_POS_MODE1_2             0x08
+
+#define BU21013_POS_MODE2_ZERO          0x01
+#define BU21013_POS_MODE2_AVG1          0x02
+#define BU21013_POS_MODE2_AVG2          0x04
+#define BU21013_POS_MODE2_EN_XY         0x08
+#define BU21013_POS_MODE2_EN_RAW        0x10
+#define BU21013_POS_MODE2_MULTI         0x80
+
+#define BU21013_CLK_MODE_DIV            0x01
+#define BU21013_CLK_MODE_EXT            0x02
+#define BU21013_CLK_MODE_CALIB          0x80
+
+#define BU21013_IDLET_0                 0x01
+#define BU21013_IDLET_1                 0x02
+#define BU21013_IDLET_2                 0x04
+#define BU21013_IDLET_3                 0x08
+#define BU21013_IDLE_INTERMIT_EN        0x10
+
+#define BU21013_DELTA_0_6       0x7F
+#define BU21013_FILTER_EN       0x80
+
+#define BU21013_INT_MODE_LEVEL  0x00
+#define BU21013_INT_MODE_EDGE   0x01
+
+#define BU21013_GAIN_0          0x01
+#define BU21013_GAIN_1          0x02
+#define BU21013_GAIN_2          0x04
+
+#define BU21013_OFFSET_MODE_DEFAULT     0x00
+#define BU21013_OFFSET_MODE_MOVE        0x01
+#define BU21013_OFFSET_MODE_DISABLE     0x02
+
+#define BU21013_TH_ON_0         0x01
+#define BU21013_TH_ON_1         0x02
+#define BU21013_TH_ON_2         0x04
+#define BU21013_TH_ON_3         0x08
+#define BU21013_TH_ON_4         0x10
+#define BU21013_TH_ON_5         0x20
+#define BU21013_TH_ON_6         0x40
+#define BU21013_TH_ON_7         0x80
+#define BU21013_TH_ON_MAX       0xFF
+
+#define BU21013_TH_OFF_0        0x01
+#define BU21013_TH_OFF_1        0x02
+#define BU21013_TH_OFF_2        0x04
+#define BU21013_TH_OFF_3        0x08
+#define BU21013_TH_OFF_4        0x10
+#define BU21013_TH_OFF_5        0x20
+#define BU21013_TH_OFF_6        0x40
+#define BU21013_TH_OFF_7        0x80
+#define BU21013_TH_OFF_MAX      0xFF
+
+#define BU21013_X_EDGE_0        0x01
+#define BU21013_X_EDGE_1        0x02
+#define BU21013_X_EDGE_2        0x04
+#define BU21013_X_EDGE_3        0x08
+#define BU21013_Y_EDGE_0        0x10
+#define BU21013_Y_EDGE_1        0x20
+#define BU21013_Y_EDGE_2        0x40
+#define BU21013_Y_EDGE_3        0x80
+
+#define BU21013_DONE    0x01
+#define BU21013_NUMBER_OF_X_SENSORS     (6)
+#define BU21013_NUMBER_OF_Y_SENSORS     (11)
+
+#define DRIVER_TP       "bu21013_tp"
+
+/**
+ * struct bu21013_ts_data - touch panel data structure
+ * @client: pointer to the i2c client
+ * @wait: variable to wait_queue_head_t structure
+ * @touch_stopped: touch stop flag
+ * @chip: pointer to the touch panel controller
+ * @in_dev: pointer to the input device structure
+ * @intr_pin: interrupt pin value
+ * @regulator: pointer to the Regulator used for touch screen
+ *
+ * Touch panel device data structure
+ */
+struct bu21013_ts_data {
+        struct i2c_client *client;
+        wait_queue_head_t wait;
+        bool touch_stopped;
+        const struct bu21013_platform_device *chip;
+        struct input_dev *in_dev;
+        unsigned int intr_pin;
+        struct regulator *regulator;
+};
+
+/**
+ * bu21013_read_block_data(): read the touch co-ordinates
+ * @data: bu21013_ts_data structure pointer
+ * @buf: byte pointer
+ *
+ * Read the touch co-ordinates using i2c read block into buffer
+ * and returns integer.
+ */
+static int bu21013_read_block_data(struct bu21013_ts_data *data, u8 *buf)
+{
+        int ret, i;
+
+        for (i = 0; i < I2C_RETRY_COUNT; i++) {
+                ret = i2c_smbus_read_i2c_block_data
+                        (data->client, BU21013_SENSORS_BTN_0_7_REG,
+                                LENGTH_OF_BUFFER, buf);
+                if (ret == LENGTH_OF_BUFFER)
+                        return 0;
+        }
+        return -EINVAL;
+}
+
+/**
+ * bu21013_do_touch_report(): Get the touch co-ordinates
+ * @data: bu21013_ts_data structure pointer
+ *
+ * Get the touch co-ordinates from touch sensor registers and writes
+ * into device structure and returns integer.
+ */
+static int bu21013_do_touch_report(struct bu21013_ts_data *data)
+{
+        u8      buf[LENGTH_OF_BUFFER];
+        unsigned int pos_x[2], pos_y[2];
+        bool    has_x_sensors, has_y_sensors;
+        int     finger_down_count = 0;
+        int     i;
+
+        if (data == NULL)
+                return -EINVAL;
+
+        if (bu21013_read_block_data(data, buf) < 0)
+                return -EINVAL;
+
+        has_x_sensors = hweight32(buf[0] & BU21013_SENSORS_EN_0_7);
+        has_y_sensors = hweight32(((buf[1] & BU21013_SENSORS_EN_8_15) |
+                ((buf[2] & BU21013_SENSORS_EN_16_23) << SHIFT_8)) >> SHIFT_2);
+        if (!has_x_sensors || !has_y_sensors)
+                return 0;
+
+        for (i = 0; i < MAX_FINGERS; i++) {
+                const u8 *p = &buf[4 * i + 3];
+                unsigned int x = p[0] << SHIFT_2 | (p[1] & MASK_BITS);
+                unsigned int y = p[2] << SHIFT_2 | (p[3] & MASK_BITS);
+                if (x == 0 || y == 0)
+                        continue;
+                pos_x[finger_down_count] = x;
+                pos_y[finger_down_count] = y;
+                finger_down_count++;
+        }
+
+        if (finger_down_count) {
+                if (finger_down_count == 2 &&
+                    (abs(pos_x[0] - pos_x[1]) < DELTA_MIN ||
+                     abs(pos_y[0] - pos_y[1]) < DELTA_MIN)) {
+                        return 0;
+                }
+
+                for (i = 0; i < finger_down_count; i++) {
+                        if (data->chip->x_flip)
+                                pos_x[i] = data->chip->touch_x_max - pos_x[i];
+                        if (data->chip->y_flip)
+                                pos_y[i] = data->chip->touch_y_max - pos_y[i];
+
+                        input_report_abs(data->in_dev,
+                                         ABS_MT_POSITION_X, pos_x[i]);
+                        input_report_abs(data->in_dev,
+                                         ABS_MT_POSITION_Y, pos_y[i]);
+                        input_mt_sync(data->in_dev);
+                }
+        } else
+                input_mt_sync(data->in_dev);
+
+        input_sync(data->in_dev);
+
+        return 0;
+}
+/**
+ * bu21013_gpio_irq() - gpio thread function for touch interrupt
+ * @irq: irq value
+ * @device_data: void pointer
+ *
+ * This gpio thread function for touch interrupt
+ * and returns irqreturn_t.
+ */
+static irqreturn_t bu21013_gpio_irq(int irq, void *device_data)
+{
+        struct bu21013_ts_data *data = device_data;
+        struct i2c_client *i2c = data->client;
+        int retval;
+
+        do {
+                retval = bu21013_do_touch_report(data);
+                if (retval < 0) {
+                        dev_err(&i2c->dev, "bu21013_do_touch_report failed\n");
+                        return IRQ_NONE;
+                }
+
+                data->intr_pin = data->chip->irq_read_val();
+                if (data->intr_pin == PEN_DOWN_INTR)
+                        wait_event_timeout(data->wait, data->touch_stopped,
+                                           msecs_to_jiffies(2));
+        } while (!data->intr_pin && !data->touch_stopped);
+
+        return IRQ_HANDLED;
+}
+
+/**
+ * bu21013_init_chip() - power on sequence for the bu21013 controller
+ * @data: device structure pointer
+ *
+ * This function is used to power on
+ * the bu21013 controller and returns integer.
+ */
+static int bu21013_init_chip(struct bu21013_ts_data *data)
+{
+        int retval;
+        struct i2c_client *i2c = data->client;
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_RESET_REG,
+                                        BU21013_RESET_ENABLE);
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_RESET reg write failed\n");
+                return retval;
+        }
+        msleep(RESET_DELAY);
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_SENSOR_0_7_REG,
+                                        BU21013_SENSORS_EN_0_7);
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_SENSOR_0_7 reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_SENSOR_8_15_REG,
+                                                BU21013_SENSORS_EN_8_15);
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_SENSOR_8_15 reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_SENSOR_16_23_REG,
+                                                BU21013_SENSORS_EN_16_23);
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_SENSOR_16_23 reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_POS_MODE1_REG,
+                                (BU21013_POS_MODE1_0 | BU21013_POS_MODE1_1));
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_POS_MODE1 reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_POS_MODE2_REG,
+                        (BU21013_POS_MODE2_ZERO | BU21013_POS_MODE2_AVG1 |
+                        BU21013_POS_MODE2_AVG2 | BU21013_POS_MODE2_EN_RAW |
+                        BU21013_POS_MODE2_MULTI));
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_POS_MODE2 reg write failed\n");
+                return retval;
+        }
+
+        if (data->chip->ext_clk)
+                retval = i2c_smbus_write_byte_data(i2c, BU21013_CLK_MODE_REG,
+                        (BU21013_CLK_MODE_EXT | BU21013_CLK_MODE_CALIB));
+        else
+                retval = i2c_smbus_write_byte_data(i2c, BU21013_CLK_MODE_REG,
+                        (BU21013_CLK_MODE_DIV | BU21013_CLK_MODE_CALIB));
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_CLK_MODE reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_IDLE_REG,
+                                (BU21013_IDLET_0 | BU21013_IDLE_INTERMIT_EN));
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_IDLE reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_INT_MODE_REG,
+                                                BU21013_INT_MODE_LEVEL);
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_INT_MODE reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_FILTER_REG,
+                                                (BU21013_DELTA_0_6 |
+                                                        BU21013_FILTER_EN));
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_FILTER reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_TH_ON_REG,
+                                        BU21013_TH_ON_5);
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_TH_ON reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_TH_OFF_REG,
+                                BU21013_TH_OFF_4 | BU21013_TH_OFF_3);
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_TH_OFF reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_GAIN_REG,
+                                        (BU21013_GAIN_0 | BU21013_GAIN_1));
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_GAIN reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_OFFSET_MODE_REG,
+                                        BU21013_OFFSET_MODE_DEFAULT);
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_OFFSET_MODE reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_XY_EDGE_REG,
+                                (BU21013_X_EDGE_0 | BU21013_X_EDGE_2 |
+                                BU21013_Y_EDGE_1 | BU21013_Y_EDGE_3));
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_XY_EDGE reg write failed\n");
+                return retval;
+        }
+
+        retval = i2c_smbus_write_byte_data(i2c, BU21013_DONE_REG,
+                                                        BU21013_DONE);
+        if (retval < 0) {
+                dev_err(&i2c->dev, "BU21013_REG_DONE reg write failed\n");
+                return retval;
+        }
+
+        return 0;
+}
+
+/**
+ * bu21013_free_irq() - frees IRQ registered for touchscreen
+ * @bu21013_data: device structure pointer
+ *
+ * This function signals interrupt thread to stop processing and
+ * frees interrupt.
+ */
+static void bu21013_free_irq(struct bu21013_ts_data *bu21013_data)
+{
+        bu21013_data->touch_stopped = true;
+        wake_up(&bu21013_data->wait);
+        free_irq(bu21013_data->chip->irq, bu21013_data);
+}
+
+/**
+ * bu21013_probe() - initializes the i2c-client touchscreen driver
+ * @client: i2c client structure pointer
+ * @id: i2c device id pointer
+ *
+ * This function used to initializes the i2c-client touchscreen
+ * driver and returns integer.
+ */
+static int __devinit bu21013_probe(struct i2c_client *client,
+                                        const struct i2c_device_id *id)
+{
+        struct bu21013_ts_data *bu21013_data;
+        struct input_dev *in_dev;
+        const struct bu21013_platform_device *pdata =
+                                        client->dev.platform_data;
+        int error;
+
+        if (!i2c_check_functionality(client->adapter,
+                                        I2C_FUNC_SMBUS_BYTE_DATA)) {
+                dev_err(&client->dev, "i2c smbus byte data not supported\n");
+                return -EIO;
+        }
+
+        if (!pdata) {
+                dev_err(&client->dev, "platform data not defined\n");
+                return -EINVAL;
+        }
+
+        bu21013_data = kzalloc(sizeof(struct bu21013_ts_data), GFP_KERNEL);
+        in_dev = input_allocate_device();
+        if (!bu21013_data || !in_dev) {
+                dev_err(&client->dev, "device memory alloc failed\n");
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        bu21013_data->in_dev = in_dev;
+        bu21013_data->chip = pdata;
+        bu21013_data->client = client;
+
+        bu21013_data->regulator = regulator_get(&client->dev, "V-TOUCH");
+        if (IS_ERR(bu21013_data->regulator)) {
+                dev_err(&client->dev, "regulator_get failed\n");
+                error = PTR_ERR(bu21013_data->regulator);
+                goto err_free_mem;
+        }
+
+        error = regulator_enable(bu21013_data->regulator);
+        if (error < 0) {
+                dev_err(&client->dev, "regulator enable failed\n");
+                goto err_put_regulator;
+        }
+
+        bu21013_data->touch_stopped = false;
+        init_waitqueue_head(&bu21013_data->wait);
+
+        /* configure the gpio pins */
+        if (pdata->cs_en) {
+                error = pdata->cs_en(pdata->cs_pin);
+                if (error < 0) {
+                        dev_err(&client->dev, "chip init failed\n");
+                        goto err_disable_regulator;
+                }
+        }
+
+        /* configure the touch panel controller */
+        error = bu21013_init_chip(bu21013_data);
+        if (error) {
+                dev_err(&client->dev, "error in bu21013 config\n");
+                goto err_cs_disable;
+        }
+
+        /* register the device to input subsystem */
+        in_dev->name = DRIVER_TP;
+        in_dev->id.bustype = BUS_I2C;
+        in_dev->dev.parent = &client->dev;
+
+        __set_bit(EV_SYN, in_dev->evbit);
+        __set_bit(EV_KEY, in_dev->evbit);
+        __set_bit(EV_ABS, in_dev->evbit);
+
+        input_set_abs_params(in_dev, ABS_MT_POSITION_X, 0,
+                                                pdata->touch_x_max, 0, 0);
+        input_set_abs_params(in_dev, ABS_MT_POSITION_Y, 0,
+                                                pdata->touch_y_max, 0, 0);
+        input_set_drvdata(in_dev, bu21013_data);
+
+        error = request_threaded_irq(pdata->irq, NULL, bu21013_gpio_irq,
+                                     IRQF_TRIGGER_FALLING | IRQF_SHARED,
+                                     DRIVER_TP, bu21013_data);
+        if (error) {
+                dev_err(&client->dev, "request irq %d failed\n", pdata->irq);
+                goto err_cs_disable;
+        }
+
+        error = input_register_device(in_dev);
+        if (error) {
+                dev_err(&client->dev, "failed to register input device\n");
+                goto err_free_irq;
+        }
+
+        device_init_wakeup(&client->dev, pdata->wakeup);
+        i2c_set_clientdata(client, bu21013_data);
+
+        return 0;
+
+err_free_irq:
+        bu21013_free_irq(bu21013_data);
+err_cs_disable:
+        pdata->cs_dis(pdata->cs_pin);
+err_disable_regulator:
+        regulator_disable(bu21013_data->regulator);
+err_put_regulator:
+        regulator_put(bu21013_data->regulator);
+err_free_mem:
+        input_free_device(in_dev);
+        kfree(bu21013_data);
+
+        return error;
+}
+/**
+ * bu21013_remove() - removes the i2c-client touchscreen driver
+ * @client: i2c client structure pointer
+ *
+ * This function uses to remove the i2c-client
+ * touchscreen driver and returns integer.
+ */
+static int __devexit bu21013_remove(struct i2c_client *client)
+{
+        struct bu21013_ts_data *bu21013_data = i2c_get_clientdata(client);
+
+        bu21013_free_irq(bu21013_data);
+
+        bu21013_data->chip->cs_dis(bu21013_data->chip->cs_pin);
+
+        input_unregister_device(bu21013_data->in_dev);
+
+        regulator_disable(bu21013_data->regulator);
+        regulator_put(bu21013_data->regulator);
+
+        kfree(bu21013_data);
+
+        device_init_wakeup(&client->dev, false);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+/**
+ * bu21013_suspend() - suspend the touch screen controller
+ * @dev: pointer to device structure
+ *
+ * This function is used to suspend the
+ * touch panel controller and returns integer
+ */
+static int bu21013_suspend(struct device *dev)
+{
+        struct bu21013_ts_data *bu21013_data = dev_get_drvdata(dev);
+        struct i2c_client *client = bu21013_data->client;
+
+        bu21013_data->touch_stopped = true;
+        if (device_may_wakeup(&client->dev))
+                enable_irq_wake(bu21013_data->chip->irq);
+        else
+                disable_irq(bu21013_data->chip->irq);
+
+        regulator_disable(bu21013_data->regulator);
+
+        return 0;
+}
+
+/**
+ * bu21013_resume() - resume the touch screen controller
+ * @dev: pointer to device structure
+ *
+ * This function is used to resume the touch panel
+ * controller and returns integer.
+ */
+static int bu21013_resume(struct device *dev)
+{
+        struct bu21013_ts_data *bu21013_data = dev_get_drvdata(dev);
+        struct i2c_client *client = bu21013_data->client;
+        int retval;
+
+        retval = regulator_enable(bu21013_data->regulator);
+        if (retval < 0) {
+                dev_err(&client->dev, "bu21013 regulator enable failed\n");
+                return retval;
+        }
+
+        retval = bu21013_init_chip(bu21013_data);
+        if (retval < 0) {
+                dev_err(&client->dev, "bu21013 controller config failed\n");
+                return retval;
+        }
+
+        bu21013_data->touch_stopped = false;
+
+        if (device_may_wakeup(&client->dev))
+                disable_irq_wake(bu21013_data->chip->irq);
+        else
+                enable_irq(bu21013_data->chip->irq);
+
+        return 0;
+}
+
+static const struct dev_pm_ops bu21013_dev_pm_ops = {
+        .suspend = bu21013_suspend,
+        .resume  = bu21013_resume,
+};
+#endif
+
+static const struct i2c_device_id bu21013_id[] = {
+        { DRIVER_TP, 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, bu21013_id);
+
+static struct i2c_driver bu21013_driver = {
+        .driver = {
+                .name   =       DRIVER_TP,
+                .owner  =       THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     =       &bu21013_dev_pm_ops,
+#endif
+        },
+        .probe          =       bu21013_probe,
+        .remove         =       __devexit_p(bu21013_remove),
+        .id_table       =       bu21013_id,
+};
+
+/**
+ * bu21013_init() - initializes the bu21013 touchscreen driver
+ *
+ * This function used to initializes the bu21013
+ * touchscreen driver and returns integer.
+ */
+static int __init bu21013_init(void)
+{
+        return i2c_add_driver(&bu21013_driver);
+}
+
+/**
+ * bu21013_exit() - de-initializes the bu21013 touchscreen driver
+ *
+ * This function uses to de-initializes the bu21013
+ * touchscreen driver and returns none.
+ */
+static void __exit bu21013_exit(void)
+{
+        i2c_del_driver(&bu21013_driver);
+}
+
+module_init(bu21013_init);
+module_exit(bu21013_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Naveen Kumar G <naveen.gaddipati@stericsson.com>");
+MODULE_DESCRIPTION("bu21013 touch screen controller driver");
diff --git a/drivers/input/touchscreen/cy8ctmg110_ts.c b/drivers/input/touchscreen/cy8ctmg110_ts.c
index 5ec0946938fe..a93c5c26ab3f 100644
--- a/drivers/input/touchscreen/cy8ctmg110_ts.c
+++ b/drivers/input/touchscreen/cy8ctmg110_ts.c
@@ -206,9 +206,9 @@ static int __devinit cy8ctmg110_probe(struct i2c_client *client,
         input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
 
         input_set_abs_params(input_dev, ABS_X,
-                        CY8CTMG110_X_MIN, CY8CTMG110_X_MAX, 0, 0);
+                        CY8CTMG110_X_MIN, CY8CTMG110_X_MAX, 4, 0);
         input_set_abs_params(input_dev, ABS_Y,
-                        CY8CTMG110_Y_MIN, CY8CTMG110_Y_MAX, 0, 0);
+                        CY8CTMG110_Y_MIN, CY8CTMG110_Y_MAX, 4, 0);
 
         if (ts->reset_pin) {
                 err = gpio_request(ts->reset_pin, NULL);
@@ -280,8 +280,9 @@ err_free_mem:
 }
 
 #ifdef CONFIG_PM
-static int cy8ctmg110_suspend(struct i2c_client *client, pm_message_t mesg)
+static int cy8ctmg110_suspend(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct cy8ctmg110 *ts = i2c_get_clientdata(client);
 
         if (device_may_wakeup(&client->dev))
@@ -293,8 +294,9 @@ static int cy8ctmg110_suspend(struct i2c_client *client, pm_message_t mesg)
         return 0;
 }
 
-static int cy8ctmg110_resume(struct i2c_client *client)
+static int cy8ctmg110_resume(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct cy8ctmg110 *ts = i2c_get_clientdata(client);
 
         if (device_may_wakeup(&client->dev))
@@ -305,6 +307,8 @@ static int cy8ctmg110_resume(struct i2c_client *client)
         }
         return 0;
 }
+
+static SIMPLE_DEV_PM_OPS(cy8ctmg110_pm, cy8ctmg110_suspend, cy8ctmg110_resume);
 #endif
 
 static int __devexit cy8ctmg110_remove(struct i2c_client *client)
@@ -335,14 +339,13 @@ static struct i2c_driver cy8ctmg110_driver = {
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = CY8CTMG110_DRIVER_NAME,
+#ifdef CONFIG_PM
+                .pm     = &cy8ctmg110_pm,
+#endif
         },
         .id_table       = cy8ctmg110_idtable,
         .probe          = cy8ctmg110_probe,
         .remove         = __devexit_p(cy8ctmg110_remove),
-#ifdef CONFIG_PM
-        .suspend        = cy8ctmg110_suspend,
-        .resume         = cy8ctmg110_resume,
-#endif
 };
 
 static int __init cy8ctmg110_init(void)
diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c
index 7a3a916f84a8..7f8f538a9806 100644
--- a/drivers/input/touchscreen/eeti_ts.c
+++ b/drivers/input/touchscreen/eeti_ts.c
@@ -261,8 +261,9 @@ static int __devexit eeti_ts_remove(struct i2c_client *client)
 }
 
 #ifdef CONFIG_PM
-static int eeti_ts_suspend(struct i2c_client *client, pm_message_t mesg)
+static int eeti_ts_suspend(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct eeti_ts_priv *priv = i2c_get_clientdata(client);
         struct input_dev *input_dev = priv->input;
 
@@ -279,8 +280,9 @@ static int eeti_ts_suspend(struct i2c_client *client, pm_message_t mesg)
         return 0;
 }
 
-static int eeti_ts_resume(struct i2c_client *client)
+static int eeti_ts_resume(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct eeti_ts_priv *priv = i2c_get_clientdata(client);
         struct input_dev *input_dev = priv->input;
 
@@ -296,9 +298,8 @@ static int eeti_ts_resume(struct i2c_client *client)
 
         return 0;
 }
-#else
-#define eeti_ts_suspend NULL
-#define eeti_ts_resume NULL
+
+static SIMPLE_DEV_PM_OPS(eeti_ts_pm, eeti_ts_suspend, eeti_ts_resume);
 #endif
 
 static const struct i2c_device_id eeti_ts_id[] = {
@@ -310,11 +311,12 @@ MODULE_DEVICE_TABLE(i2c, eeti_ts_id);
 static struct i2c_driver eeti_ts_driver = {
         .driver = {
                 .name = "eeti_ts",
+#ifdef CONFIG_PM
+                .pm = &eeti_ts_pm,
+#endif
         },
         .probe = eeti_ts_probe,
         .remove = __devexit_p(eeti_ts_remove),
-        .suspend = eeti_ts_suspend,
-        .resume = eeti_ts_resume,
         .id_table = eeti_ts_id,
 };
 
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
index b4d7f63deff1..211811ae5525 100644
--- a/drivers/input/touchscreen/h3600_ts_input.c
+++ b/drivers/input/touchscreen/h3600_ts_input.c
@@ -62,7 +62,7 @@ MODULE_LICENSE("GPL");
         Programmer has no control over these numbers.
         TODO there are holes - specifically  1,7,0x0a
 */
-#define VERSION_ID              0       /* Get Version (request/respose) */
+#define VERSION_ID              0       /* Get Version (request/response) */
 #define KEYBD_ID                2       /* Keyboard (event) */
 #define TOUCHS_ID               3       /* Touch Screen (event)*/
 #define EEPROM_READ_ID          4       /* (request/response) */
@@ -396,34 +396,37 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv)
         set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE);
 
         if (request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler,
-                        IRQF_SHARED | IRQF_DISABLED, "h3600_action", &ts->dev)) {
+                        IRQF_SHARED | IRQF_DISABLED, "h3600_action", ts->dev)) {
                 printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n");
                 err = -EBUSY;
-                goto fail2;
+                goto fail1;
         }
 
         if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler,
-                        IRQF_SHARED | IRQF_DISABLED, "h3600_suspend", &ts->dev)) {
+                        IRQF_SHARED | IRQF_DISABLED, "h3600_suspend", ts->dev)) {
                 printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n");
                 err = -EBUSY;
-                goto fail3;
+                goto fail2;
         }
 
         serio_set_drvdata(serio, ts);
 
         err = serio_open(serio, drv);
         if (err)
-                return err;
+                goto fail3;
 
         //h3600_flite_control(1, 25);     /* default brightness */
-        input_register_device(ts->dev);
+        err = input_register_device(ts->dev);
+        if (err)
+                goto fail4;
 
         return 0;
 
-fail3:  free_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, ts->dev);
+fail4:  serio_close(serio);
+fail3:  serio_set_drvdata(serio, NULL);
+        free_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, ts->dev);
 fail2:  free_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, ts->dev);
-fail1:  serio_set_drvdata(serio, NULL);
-        input_free_device(input_dev);
+fail1:  input_free_device(input_dev);
         kfree(ts);
         return err;
 }
@@ -436,8 +439,8 @@ static void h3600ts_disconnect(struct serio *serio)
 {
         struct h3600_dev *ts = serio_get_drvdata(serio);
 
-        free_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, &ts->dev);
-        free_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, &ts->dev);
+        free_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, ts->dev);
+        free_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, ts->dev);
         input_get_device(ts->dev);
         input_unregister_device(ts->dev);
         serio_close(serio);
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index a89700e7ace4..dd4e8f020b99 100644
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -28,29 +28,29 @@ static void do_softint(struct work_struct *work)
         u8 scpdr;
         int touched = 0;
 
-        if (ctrl_inb(PHDR) & PHDR_TS_PEN_DOWN) {
-                scpdr = ctrl_inb(SCPDR);
+        if (__raw_readb(PHDR) & PHDR_TS_PEN_DOWN) {
+                scpdr = __raw_readb(SCPDR);
                 scpdr |= SCPDR_TS_SCAN_ENABLE;
                 scpdr &= ~SCPDR_TS_SCAN_Y;
-                ctrl_outb(scpdr, SCPDR);
+                __raw_writeb(scpdr, SCPDR);
                 udelay(30);
 
                 absy = adc_single(ADC_CHANNEL_TS_Y);
 
-                scpdr = ctrl_inb(SCPDR);
+                scpdr = __raw_readb(SCPDR);
                 scpdr |= SCPDR_TS_SCAN_Y;
                 scpdr &= ~SCPDR_TS_SCAN_X;
-                ctrl_outb(scpdr, SCPDR);
+                __raw_writeb(scpdr, SCPDR);
                 udelay(30);
 
                 absx = adc_single(ADC_CHANNEL_TS_X);
 
-                scpdr = ctrl_inb(SCPDR);
+                scpdr = __raw_readb(SCPDR);
                 scpdr |= SCPDR_TS_SCAN_X;
                 scpdr &= ~SCPDR_TS_SCAN_ENABLE;
-                ctrl_outb(scpdr, SCPDR);
+                __raw_writeb(scpdr, SCPDR);
                 udelay(100);
-                touched = ctrl_inb(PHDR) & PHDR_TS_PEN_DOWN;
+                touched = __raw_readb(PHDR) & PHDR_TS_PEN_DOWN;
         }
 
         if (touched) {
@@ -107,8 +107,7 @@ static int __init hp680_ts_init(void)
         return 0;
 
  fail2: free_irq(HP680_TS_IRQ, NULL);
-        cancel_delayed_work(&work);
-        flush_scheduled_work();
+        cancel_delayed_work_sync(&work);
  fail1: input_free_device(hp680_ts_dev);
         return err;
 }
@@ -116,8 +115,7 @@ static int __init hp680_ts_init(void)
 static void __exit hp680_ts_exit(void)
 {
         free_irq(HP680_TS_IRQ, NULL);
-        cancel_delayed_work(&work);
-        flush_scheduled_work();
+        cancel_delayed_work_sync(&work);
         input_unregister_device(hp680_ts_dev);
 }
 
diff --git a/drivers/input/touchscreen/intel-mid-touch.c b/drivers/input/touchscreen/intel-mid-touch.c
new file mode 100644
index 000000000000..66c96bfc5522
--- /dev/null
+++ b/drivers/input/touchscreen/intel-mid-touch.c
@@ -0,0 +1,687 @@
+/*
+ * Intel MID Resistive Touch Screen Driver
+ *
+ * Copyright (C) 2008 Intel Corp
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * This program 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; version 2 of the License.
+ *
+ * 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 program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * Questions/Comments/Bug fixes to Sreedhara (sreedhara.ds@intel.com)
+ *                          Ramesh Agarwal (ramesh.agarwal@intel.com)
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * TODO:
+ *      review conversion of r/m/w sequences
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/err.h>
+#include <linux/param.h>
+#include <linux/slab.h>
+#include <linux/platform_device.h>
+#include <linux/irq.h>
+#include <linux/delay.h>
+#include <asm/intel_scu_ipc.h>
+
+/* PMIC Interrupt registers */
+#define PMIC_REG_ID1            0x00 /* PMIC ID1 register */
+
+/* PMIC Interrupt registers */
+#define PMIC_REG_INT            0x04 /* PMIC interrupt register */
+#define PMIC_REG_MINT           0x05 /* PMIC interrupt mask register */
+
+/* ADC Interrupt registers */
+#define PMIC_REG_ADCINT         0x5F /* ADC interrupt register */
+#define PMIC_REG_MADCINT        0x60 /* ADC interrupt mask register */
+
+/* ADC Control registers */
+#define PMIC_REG_ADCCNTL1       0x61 /* ADC control register */
+
+/* ADC Channel Selection registers */
+#define PMICADDR0               0xA4
+#define END_OF_CHANNEL          0x1F
+
+/* ADC Result register */
+#define PMIC_REG_ADCSNS0H       0x64
+
+/* ADC channels for touch screen */
+#define MRST_TS_CHAN10          0xA /* Touch screen X+ connection */
+#define MRST_TS_CHAN11          0xB /* Touch screen X- connection */
+#define MRST_TS_CHAN12          0xC /* Touch screen Y+ connection */
+#define MRST_TS_CHAN13          0xD /* Touch screen Y- connection */
+
+/* Touch screen channel BIAS constants */
+#define MRST_XBIAS              0x20
+#define MRST_YBIAS              0x40
+#define MRST_ZBIAS              0x80
+
+/* Touch screen coordinates */
+#define MRST_X_MIN              10
+#define MRST_X_MAX              1024
+#define MRST_X_FUZZ             5
+#define MRST_Y_MIN              10
+#define MRST_Y_MAX              1024
+#define MRST_Y_FUZZ             5
+#define MRST_PRESSURE_MIN       0
+#define MRST_PRESSURE_NOMINAL   50
+#define MRST_PRESSURE_MAX       100
+
+#define WAIT_ADC_COMPLETION     10 /* msec */
+
+/* PMIC ADC round robin delays */
+#define ADC_LOOP_DELAY0         0x0 /* Continuous loop */
+#define ADC_LOOP_DELAY1         0x1 /* 4.5  ms approximate */
+
+/* PMIC Vendor Identifiers */
+#define PMIC_VENDOR_FS          0 /* PMIC vendor FreeScale */
+#define PMIC_VENDOR_MAXIM       1 /* PMIC vendor MAXIM */
+#define PMIC_VENDOR_NEC         2 /* PMIC vendor NEC */
+#define MRSTOUCH_MAX_CHANNELS   32 /* Maximum ADC channels */
+
+/* Touch screen device structure */
+struct mrstouch_dev {
+        struct device *dev; /* device associated with touch screen */
+        struct input_dev *input;
+        char phys[32];
+        u16 asr;                /* Address selection register */
+        int irq;
+        unsigned int vendor;    /* PMIC vendor */
+        unsigned int rev;       /* PMIC revision */
+
+        int (*read_prepare)(struct mrstouch_dev *tsdev);
+        int (*read)(struct mrstouch_dev *tsdev, u16 *x, u16 *y, u16 *z);
+        int (*read_finish)(struct mrstouch_dev *tsdev);
+};
+
+
+/*************************** NEC and Maxim Interface ************************/
+
+static int mrstouch_nec_adc_read_prepare(struct mrstouch_dev *tsdev)
+{
+        return intel_scu_ipc_update_register(PMIC_REG_MADCINT, 0, 0x20);
+}
+
+/*
+ * Enables PENDET interrupt.
+ */
+static int mrstouch_nec_adc_read_finish(struct mrstouch_dev *tsdev)
+{
+        int err;
+
+        err = intel_scu_ipc_update_register(PMIC_REG_MADCINT, 0x20, 0x20);
+        if (!err)
+                err = intel_scu_ipc_update_register(PMIC_REG_ADCCNTL1, 0, 0x05);
+
+        return err;
+}
+
+/*
+ * Reads PMIC ADC touch screen result
+ * Reads ADC storage registers for higher 7 and lower 3 bits and
+ * converts the two readings into a single value and turns off gain bit
+ */
+static int mrstouch_ts_chan_read(u16 offset, u16 chan, u16 *vp, u16 *vm)
+{
+        int err;
+        u16 result;
+        u32 res;
+
+        result = PMIC_REG_ADCSNS0H + offset;
+
+        if (chan == MRST_TS_CHAN12)
+                result += 4;
+
+        err = intel_scu_ipc_ioread32(result, &res);
+        if (err)
+                return err;
+
+        /* Mash the bits up */
+
+        *vp = (res & 0xFF) << 3;        /* Highest 7 bits */
+        *vp |= (res >> 8) & 0x07;       /* Lower 3 bits */
+        *vp &= 0x3FF;
+
+        res >>= 16;
+
+        *vm = (res & 0xFF) << 3;        /* Highest 7 bits */
+        *vm |= (res >> 8) & 0x07;       /* Lower 3 bits */
+        *vm &= 0x3FF;
+
+        return 0;
+}
+
+/*
+ * Enables X, Y and Z bias values
+ * Enables YPYM for X channels and XPXM for Y channels
+ */
+static int mrstouch_ts_bias_set(uint offset, uint bias)
+{
+        int count;
+        u16 chan, start;
+        u16 reg[4];
+        u8 data[4];
+
+        chan = PMICADDR0 + offset;
+        start = MRST_TS_CHAN10;
+
+        for (count = 0; count <= 3; count++) {
+                reg[count] = chan++;
+                data[count] = bias | (start + count);
+        }
+
+        return intel_scu_ipc_writev(reg, data, 4);
+}
+
+/* To read touch screen channel values */
+static int mrstouch_nec_adc_read(struct mrstouch_dev *tsdev,
+                                 u16 *x, u16 *y, u16 *z)
+{
+        int err;
+        u16 xm, ym, zm;
+
+        /* configure Y bias for X channels */
+        err = mrstouch_ts_bias_set(tsdev->asr, MRST_YBIAS);
+        if (err)
+                goto ipc_error;
+
+        msleep(WAIT_ADC_COMPLETION);
+
+        /* read x+ and x- channels */
+        err = mrstouch_ts_chan_read(tsdev->asr, MRST_TS_CHAN10, x, &xm);
+        if (err)
+                goto ipc_error;
+
+        /* configure x bias for y channels */
+        err = mrstouch_ts_bias_set(tsdev->asr, MRST_XBIAS);
+        if (err)
+                goto ipc_error;
+
+        msleep(WAIT_ADC_COMPLETION);
+
+        /* read y+ and y- channels */
+        err = mrstouch_ts_chan_read(tsdev->asr, MRST_TS_CHAN12, y, &ym);
+        if (err)
+                goto ipc_error;
+
+        /* configure z bias for x and y channels */
+        err = mrstouch_ts_bias_set(tsdev->asr, MRST_ZBIAS);
+        if (err)
+                goto ipc_error;
+
+        msleep(WAIT_ADC_COMPLETION);
+
+        /* read z+ and z- channels */
+        err = mrstouch_ts_chan_read(tsdev->asr, MRST_TS_CHAN10, z, &zm);
+        if (err)
+                goto ipc_error;
+
+        return 0;
+
+ipc_error:
+        dev_err(tsdev->dev, "ipc error during adc read\n");
+        return err;
+}
+
+
+/*************************** Freescale Interface ************************/
+
+static int mrstouch_fs_adc_read_prepare(struct mrstouch_dev *tsdev)
+{
+        int err, count;
+        u16 chan;
+        u16 reg[5];
+        u8 data[5];
+
+        /* Stop the ADC */
+        err = intel_scu_ipc_update_register(PMIC_REG_MADCINT, 0x00, 0x02);
+        if (err)
+                goto ipc_error;
+
+        chan = PMICADDR0 + tsdev->asr;
+
+        /* Set X BIAS */
+        for (count = 0; count <= 3; count++) {
+                reg[count] = chan++;
+                data[count] = 0x2A;
+        }
+        reg[count] =  chan++; /* Dummy */
+        data[count] = 0;
+
+        err = intel_scu_ipc_writev(reg, data, 5);
+        if (err)
+                goto ipc_error;
+
+        msleep(WAIT_ADC_COMPLETION);
+
+        /* Set Y BIAS */
+        for (count = 0; count <= 3; count++) {
+                reg[count] = chan++;
+                data[count] = 0x4A;
+        }
+        reg[count] = chan++; /* Dummy */
+        data[count] = 0;
+
+        err = intel_scu_ipc_writev(reg, data, 5);
+        if (err)
+                goto ipc_error;
+
+        msleep(WAIT_ADC_COMPLETION);
+
+        /* Set Z BIAS */
+        err = intel_scu_ipc_iowrite32(chan + 2, 0x8A8A8A8A);
+        if (err)
+                goto ipc_error;
+
+        msleep(WAIT_ADC_COMPLETION);
+
+        return 0;
+
+ipc_error:
+        dev_err(tsdev->dev, "ipc error during %s\n", __func__);
+        return err;
+}
+
+static int mrstouch_fs_adc_read(struct mrstouch_dev *tsdev,
+                                u16 *x, u16 *y, u16 *z)
+{
+        int err;
+        u16 result;
+        u16 reg[4];
+        u8 data[4];
+
+        result = PMIC_REG_ADCSNS0H + tsdev->asr;
+
+        reg[0] = result + 4;
+        reg[1] = result + 5;
+        reg[2] = result + 16;
+        reg[3] = result + 17;
+
+        err = intel_scu_ipc_readv(reg, data, 4);
+        if (err)
+                goto ipc_error;
+
+        *x = data[0] << 3; /* Higher 7 bits */
+        *x |= data[1] & 0x7; /* Lower 3 bits */
+        *x &= 0x3FF;
+
+        *y = data[2] << 3; /* Higher 7 bits */
+        *y |= data[3] & 0x7; /* Lower 3 bits */
+        *y &= 0x3FF;
+
+        /* Read Z value */
+        reg[0] = result + 28;
+        reg[1] = result + 29;
+
+        err = intel_scu_ipc_readv(reg, data, 4);
+        if (err)
+                goto ipc_error;
+
+        *z = data[0] << 3; /* Higher 7 bits */
+        *z |= data[1] & 0x7; /* Lower 3 bits */
+        *z &= 0x3FF;
+
+        return 0;
+
+ipc_error:
+        dev_err(tsdev->dev, "ipc error during %s\n", __func__);
+        return err;
+}
+
+static int mrstouch_fs_adc_read_finish(struct mrstouch_dev *tsdev)
+{
+        int err, count;
+        u16 chan;
+        u16 reg[5];
+        u8 data[5];
+
+        /* Clear all TS channels */
+        chan = PMICADDR0 + tsdev->asr;
+        for (count = 0; count <= 4; count++) {
+                reg[count] = chan++;
+                data[count] = 0;
+        }
+        err = intel_scu_ipc_writev(reg, data, 5);
+        if (err)
+                goto ipc_error;
+
+        for (count = 0; count <= 4; count++) {
+                reg[count] = chan++;
+                data[count] = 0;
+        }
+        err = intel_scu_ipc_writev(reg, data, 5);
+        if (err)
+                goto ipc_error;
+
+        err = intel_scu_ipc_iowrite32(chan + 2, 0x00000000);
+        if (err)
+                goto ipc_error;
+
+        /* Start ADC */
+        err = intel_scu_ipc_update_register(PMIC_REG_MADCINT, 0x02, 0x02);
+        if (err)
+                goto ipc_error;
+
+        return 0;
+
+ipc_error:
+        dev_err(tsdev->dev, "ipc error during %s\n", __func__);
+        return err;
+}
+
+static void mrstouch_report_event(struct input_dev *input,
+                        unsigned int x, unsigned int y, unsigned int z)
+{
+        if (z > MRST_PRESSURE_NOMINAL) {
+                /* Pen touched, report button touch and coordinates */
+                input_report_key(input, BTN_TOUCH, 1);
+                input_report_abs(input, ABS_X, x);
+                input_report_abs(input, ABS_Y, y);
+        } else {
+                input_report_key(input, BTN_TOUCH, 0);
+        }
+
+        input_report_abs(input, ABS_PRESSURE, z);
+        input_sync(input);
+}
+
+/* PENDET interrupt handler */
+static irqreturn_t mrstouch_pendet_irq(int irq, void *dev_id)
+{
+        struct mrstouch_dev *tsdev = dev_id;
+        u16 x, y, z;
+
+        /*
+         * Should we lower thread priority? Probably not, since we are
+         * not spinning but sleeping...
+         */
+
+        if (tsdev->read_prepare(tsdev))
+                goto out;
+
+        do {
+                if (tsdev->read(tsdev, &x, &y, &z))
+                        break;
+
+                mrstouch_report_event(tsdev->input, x, y, z);
+        } while (z > MRST_PRESSURE_NOMINAL);
+
+        tsdev->read_finish(tsdev);
+
+out:
+        return IRQ_HANDLED;
+}
+
+/* Utility to read PMIC ID */
+static int __devinit mrstouch_read_pmic_id(uint *vendor, uint *rev)
+{
+        int err;
+        u8 r;
+
+        err = intel_scu_ipc_ioread8(PMIC_REG_ID1, &r);
+        if (err)
+                return err;
+
+        *vendor = r & 0x7;
+        *rev = (r >> 3) & 0x7;
+
+        return 0;
+}
+
+/*
+ * Parse ADC channels to find end of the channel configured by other ADC user
+ * NEC and MAXIM requires 4 channels and FreeScale needs 18 channels
+ */
+static int __devinit mrstouch_chan_parse(struct mrstouch_dev *tsdev)
+{
+        int err, i, found;
+        u8 r8;
+
+        found = -1;
+
+        for (i = 0; i < MRSTOUCH_MAX_CHANNELS; i++) {
+                if (found >= 0)
+                        break;
+
+                err = intel_scu_ipc_ioread8(PMICADDR0 + i, &r8);
+                if (err)
+                        return err;
+
+                if (r8 == END_OF_CHANNEL) {
+                        found = i;
+                        break;
+                }
+        }
+        if (found < 0)
+                return 0;
+
+        if (tsdev->vendor == PMIC_VENDOR_FS) {
+                if (found && found > (MRSTOUCH_MAX_CHANNELS - 18))
+                        return -ENOSPC;
+        } else {
+                if (found && found > (MRSTOUCH_MAX_CHANNELS - 4))
+                        return -ENOSPC;
+        }
+        return found;
+}
+
+
+/*
+ * Writes touch screen channels to ADC address selection registers
+ */
+static int __devinit mrstouch_ts_chan_set(uint offset)
+{
+        u16 chan;
+
+        int ret, count;
+
+        chan = PMICADDR0 + offset;
+        for (count = 0; count <= 3; count++) {
+                ret = intel_scu_ipc_iowrite8(chan++, MRST_TS_CHAN10 + count);
+                if (ret)
+                        return ret;
+        }
+        return intel_scu_ipc_iowrite8(chan++, END_OF_CHANNEL);
+}
+
+/* Initialize ADC */
+static int __devinit mrstouch_adc_init(struct mrstouch_dev *tsdev)
+{
+        int err, start;
+        u8 ra, rm;
+
+        err = mrstouch_read_pmic_id(&tsdev->vendor, &tsdev->rev);
+        if (err) {
+                dev_err(tsdev->dev, "Unable to read PMIC id\n");
+                return err;
+        }
+
+        switch (tsdev->vendor) {
+        case PMIC_VENDOR_NEC:
+        case PMIC_VENDOR_MAXIM:
+                tsdev->read_prepare = mrstouch_nec_adc_read_prepare;
+                tsdev->read = mrstouch_nec_adc_read;
+                tsdev->read_finish = mrstouch_nec_adc_read_finish;
+                break;
+
+        case PMIC_VENDOR_FS:
+                tsdev->read_prepare = mrstouch_fs_adc_read_prepare;
+                tsdev->read = mrstouch_fs_adc_read;
+                tsdev->read_finish = mrstouch_fs_adc_read_finish;
+                break;
+
+        default:
+                dev_err(tsdev->dev,
+                        "Unsupported touchscreen: %d\n", tsdev->vendor);
+                return -ENXIO;
+        }
+
+        start = mrstouch_chan_parse(tsdev);
+        if (start < 0) {
+                dev_err(tsdev->dev, "Unable to parse channels\n");
+                return start;
+        }
+
+        tsdev->asr = start;
+
+        /*
+         * ADC power on, start, enable PENDET and set loop delay
+         * ADC loop delay is set to 4.5 ms approximately
+         * Loop delay more than this results in jitter in adc readings
+         * Setting loop delay to 0 (continuous loop) in MAXIM stops PENDET
+         * interrupt generation sometimes.
+         */
+
+        if (tsdev->vendor == PMIC_VENDOR_FS) {
+                ra = 0xE0 | ADC_LOOP_DELAY0;
+                rm = 0x5;
+        } else {
+                /* NEC and MAXIm not consistent with loop delay 0 */
+                ra = 0xE0 | ADC_LOOP_DELAY1;
+                rm = 0x0;
+
+                /* configure touch screen channels */
+                err = mrstouch_ts_chan_set(tsdev->asr);
+                if (err)
+                        return err;
+        }
+
+        err = intel_scu_ipc_update_register(PMIC_REG_ADCCNTL1, ra, 0xE7);
+        if (err)
+                return err;
+
+        err = intel_scu_ipc_update_register(PMIC_REG_MADCINT, rm, 0x03);
+        if (err)
+                return err;
+
+        return 0;
+}
+
+
+/* Probe function for touch screen driver */
+static int __devinit mrstouch_probe(struct platform_device *pdev)
+{
+        struct mrstouch_dev *tsdev;
+        struct input_dev *input;
+        int err;
+        int irq;
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "no interrupt assigned\n");
+                return -EINVAL;
+        }
+
+        tsdev = kzalloc(sizeof(struct mrstouch_dev), GFP_KERNEL);
+        input = input_allocate_device();
+        if (!tsdev || !input) {
+                dev_err(&pdev->dev, "unable to allocate memory\n");
+                err = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        tsdev->dev = &pdev->dev;
+        tsdev->input = input;
+        tsdev->irq = irq;
+
+        snprintf(tsdev->phys, sizeof(tsdev->phys),
+                 "%s/input0", dev_name(tsdev->dev));
+
+        err = mrstouch_adc_init(tsdev);
+        if (err) {
+                dev_err(&pdev->dev, "ADC initialization failed\n");
+                goto err_free_mem;
+        }
+
+        input->name = "mrst_touchscreen";
+        input->phys = tsdev->phys;
+        input->dev.parent = tsdev->dev;
+
+        input->id.vendor = tsdev->vendor;
+        input->id.version = tsdev->rev;
+
+        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(tsdev->input, ABS_X,
+                             MRST_X_MIN, MRST_X_MAX, MRST_X_FUZZ, 0);
+        input_set_abs_params(tsdev->input, ABS_Y,
+                             MRST_Y_MIN, MRST_Y_MAX, MRST_Y_FUZZ, 0);
+        input_set_abs_params(tsdev->input, ABS_PRESSURE,
+                             MRST_PRESSURE_MIN, MRST_PRESSURE_MAX, 0, 0);
+
+        err = request_threaded_irq(tsdev->irq, NULL, mrstouch_pendet_irq,
+                                   0, "mrstouch", tsdev);
+        if (err) {
+                dev_err(tsdev->dev, "unable to allocate irq\n");
+                goto err_free_mem;
+        }
+
+        err = input_register_device(tsdev->input);
+        if (err) {
+                dev_err(tsdev->dev, "unable to register input device\n");
+                goto err_free_irq;
+        }
+
+        platform_set_drvdata(pdev, tsdev);
+        return 0;
+
+err_free_irq:
+        free_irq(tsdev->irq, tsdev);
+err_free_mem:
+        input_free_device(input);
+        kfree(tsdev);
+        return err;
+}
+
+static int __devexit mrstouch_remove(struct platform_device *pdev)
+{
+        struct mrstouch_dev *tsdev = platform_get_drvdata(pdev);
+
+        free_irq(tsdev->irq, tsdev);
+        input_unregister_device(tsdev->input);
+        kfree(tsdev);
+
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver mrstouch_driver = {
+        .driver = {
+                .name   = "pmic_touch",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = mrstouch_probe,
+        .remove         = __devexit_p(mrstouch_remove),
+};
+
+static int __init mrstouch_init(void)
+{
+        return platform_driver_register(&mrstouch_driver);
+}
+module_init(mrstouch_init);
+
+static void __exit mrstouch_exit(void)
+{
+        platform_driver_unregister(&mrstouch_driver);
+}
+module_exit(mrstouch_exit);
+
+MODULE_AUTHOR("Sreedhara Murthy. D.S, sreedhara.ds@intel.com");
+MODULE_DESCRIPTION("Intel Moorestown Resistive Touch Screen Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/lpc32xx_ts.c b/drivers/input/touchscreen/lpc32xx_ts.c
new file mode 100644
index 000000000000..dcf803f5a1f7
--- /dev/null
+++ b/drivers/input/touchscreen/lpc32xx_ts.c
@@ -0,0 +1,411 @@
+/*
+ * LPC32xx built-in touchscreen driver
+ *
+ * Copyright (C) 2010 NXP Semiconductors
+ *
+ * This program 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 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.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+
+/*
+ * Touchscreen controller register offsets
+ */
+#define LPC32XX_TSC_STAT                        0x00
+#define LPC32XX_TSC_SEL                         0x04
+#define LPC32XX_TSC_CON                         0x08
+#define LPC32XX_TSC_FIFO                        0x0C
+#define LPC32XX_TSC_DTR                         0x10
+#define LPC32XX_TSC_RTR                         0x14
+#define LPC32XX_TSC_UTR                         0x18
+#define LPC32XX_TSC_TTR                         0x1C
+#define LPC32XX_TSC_DXP                         0x20
+#define LPC32XX_TSC_MIN_X                       0x24
+#define LPC32XX_TSC_MAX_X                       0x28
+#define LPC32XX_TSC_MIN_Y                       0x2C
+#define LPC32XX_TSC_MAX_Y                       0x30
+#define LPC32XX_TSC_AUX_UTR                     0x34
+#define LPC32XX_TSC_AUX_MIN                     0x38
+#define LPC32XX_TSC_AUX_MAX                     0x3C
+
+#define LPC32XX_TSC_STAT_FIFO_OVRRN             (1 << 8)
+#define LPC32XX_TSC_STAT_FIFO_EMPTY             (1 << 7)
+
+#define LPC32XX_TSC_SEL_DEFVAL                  0x0284
+
+#define LPC32XX_TSC_ADCCON_IRQ_TO_FIFO_4        (0x1 << 11)
+#define LPC32XX_TSC_ADCCON_X_SAMPLE_SIZE(s)     ((10 - (s)) << 7)
+#define LPC32XX_TSC_ADCCON_Y_SAMPLE_SIZE(s)     ((10 - (s)) << 4)
+#define LPC32XX_TSC_ADCCON_POWER_UP             (1 << 2)
+#define LPC32XX_TSC_ADCCON_AUTO_EN              (1 << 0)
+
+#define LPC32XX_TSC_FIFO_TS_P_LEVEL             (1 << 31)
+#define LPC32XX_TSC_FIFO_NORMALIZE_X_VAL(x)     (((x) & 0x03FF0000) >> 16)
+#define LPC32XX_TSC_FIFO_NORMALIZE_Y_VAL(y)     ((y) & 0x000003FF)
+
+#define LPC32XX_TSC_ADCDAT_VALUE_MASK           0x000003FF
+
+#define LPC32XX_TSC_MIN_XY_VAL                  0x0
+#define LPC32XX_TSC_MAX_XY_VAL                  0x3FF
+
+#define MOD_NAME "ts-lpc32xx"
+
+#define tsc_readl(dev, reg) \
+        __raw_readl((dev)->tsc_base + (reg))
+#define tsc_writel(dev, reg, val) \
+        __raw_writel((val), (dev)->tsc_base + (reg))
+
+struct lpc32xx_tsc {
+        struct input_dev *dev;
+        void __iomem *tsc_base;
+        int irq;
+        struct clk *clk;
+};
+
+static void lpc32xx_fifo_clear(struct lpc32xx_tsc *tsc)
+{
+        while (!(tsc_readl(tsc, LPC32XX_TSC_STAT) &
+                        LPC32XX_TSC_STAT_FIFO_EMPTY))
+                tsc_readl(tsc, LPC32XX_TSC_FIFO);
+}
+
+static irqreturn_t lpc32xx_ts_interrupt(int irq, void *dev_id)
+{
+        u32 tmp, rv[4], xs[4], ys[4];
+        int idx;
+        struct lpc32xx_tsc *tsc = dev_id;
+        struct input_dev *input = tsc->dev;
+
+        tmp = tsc_readl(tsc, LPC32XX_TSC_STAT);
+
+        if (tmp & LPC32XX_TSC_STAT_FIFO_OVRRN) {
+                /* FIFO overflow - throw away samples */
+                lpc32xx_fifo_clear(tsc);
+                return IRQ_HANDLED;
+        }
+
+        /*
+         * Gather and normalize 4 samples. Pen-up events may have less
+         * than 4 samples, but its ok to pop 4 and let the last sample
+         * pen status check drop the samples.
+         */
+        idx = 0;
+        while (idx < 4 &&
+               !(tsc_readl(tsc, LPC32XX_TSC_STAT) &
+                        LPC32XX_TSC_STAT_FIFO_EMPTY)) {
+                tmp = tsc_readl(tsc, LPC32XX_TSC_FIFO);
+                xs[idx] = LPC32XX_TSC_ADCDAT_VALUE_MASK -
+                        LPC32XX_TSC_FIFO_NORMALIZE_X_VAL(tmp);
+                ys[idx] = LPC32XX_TSC_ADCDAT_VALUE_MASK -
+                        LPC32XX_TSC_FIFO_NORMALIZE_Y_VAL(tmp);
+                rv[idx] = tmp;
+                idx++;
+        }
+
+        /* Data is only valid if pen is still down in last sample */
+        if (!(rv[3] & LPC32XX_TSC_FIFO_TS_P_LEVEL) && idx == 4) {
+                /* Use average of 2nd and 3rd sample for position */
+                input_report_abs(input, ABS_X, (xs[1] + xs[2]) / 2);
+                input_report_abs(input, ABS_Y, (ys[1] + ys[2]) / 2);
+                input_report_key(input, BTN_TOUCH, 1);
+        } else {
+                input_report_key(input, BTN_TOUCH, 0);
+        }
+
+        input_sync(input);
+
+        return IRQ_HANDLED;
+}
+
+static void lpc32xx_stop_tsc(struct lpc32xx_tsc *tsc)
+{
+        /* Disable auto mode */
+        tsc_writel(tsc, LPC32XX_TSC_CON,
+                   tsc_readl(tsc, LPC32XX_TSC_CON) &
+                             ~LPC32XX_TSC_ADCCON_AUTO_EN);
+
+        clk_disable(tsc->clk);
+}
+
+static void lpc32xx_setup_tsc(struct lpc32xx_tsc *tsc)
+{
+        u32 tmp;
+
+        clk_enable(tsc->clk);
+
+        tmp = tsc_readl(tsc, LPC32XX_TSC_CON) & ~LPC32XX_TSC_ADCCON_POWER_UP;
+
+        /* Set the TSC FIFO depth to 4 samples @ 10-bits per sample (max) */
+        tmp = LPC32XX_TSC_ADCCON_IRQ_TO_FIFO_4 |
+              LPC32XX_TSC_ADCCON_X_SAMPLE_SIZE(10) |
+              LPC32XX_TSC_ADCCON_Y_SAMPLE_SIZE(10);
+        tsc_writel(tsc, LPC32XX_TSC_CON, tmp);
+
+        /* These values are all preset */
+        tsc_writel(tsc, LPC32XX_TSC_SEL, LPC32XX_TSC_SEL_DEFVAL);
+        tsc_writel(tsc, LPC32XX_TSC_MIN_X, LPC32XX_TSC_MIN_XY_VAL);
+        tsc_writel(tsc, LPC32XX_TSC_MAX_X, LPC32XX_TSC_MAX_XY_VAL);
+        tsc_writel(tsc, LPC32XX_TSC_MIN_Y, LPC32XX_TSC_MIN_XY_VAL);
+        tsc_writel(tsc, LPC32XX_TSC_MAX_Y, LPC32XX_TSC_MAX_XY_VAL);
+
+        /* Aux support is not used */
+        tsc_writel(tsc, LPC32XX_TSC_AUX_UTR, 0);
+        tsc_writel(tsc, LPC32XX_TSC_AUX_MIN, 0);
+        tsc_writel(tsc, LPC32XX_TSC_AUX_MAX, 0);
+
+        /*
+         * Set sample rate to about 240Hz per X/Y pair. A single measurement
+         * consists of 4 pairs which gives about a 60Hz sample rate based on
+         * a stable 32768Hz clock source. Values are in clocks.
+         * Rate is (32768 / (RTR + XCONV + RTR + YCONV + DXP + TTR + UTR) / 4
+         */
+        tsc_writel(tsc, LPC32XX_TSC_RTR, 0x2);
+        tsc_writel(tsc, LPC32XX_TSC_DTR, 0x2);
+        tsc_writel(tsc, LPC32XX_TSC_TTR, 0x10);
+        tsc_writel(tsc, LPC32XX_TSC_DXP, 0x4);
+        tsc_writel(tsc, LPC32XX_TSC_UTR, 88);
+
+        lpc32xx_fifo_clear(tsc);
+
+        /* Enable automatic ts event capture */
+        tsc_writel(tsc, LPC32XX_TSC_CON, tmp | LPC32XX_TSC_ADCCON_AUTO_EN);
+}
+
+static int lpc32xx_ts_open(struct input_dev *dev)
+{
+        struct lpc32xx_tsc *tsc = input_get_drvdata(dev);
+
+        lpc32xx_setup_tsc(tsc);
+
+        return 0;
+}
+
+static void lpc32xx_ts_close(struct input_dev *dev)
+{
+        struct lpc32xx_tsc *tsc = input_get_drvdata(dev);
+
+        lpc32xx_stop_tsc(tsc);
+}
+
+static int __devinit lpc32xx_ts_probe(struct platform_device *pdev)
+{
+        struct lpc32xx_tsc *tsc;
+        struct input_dev *input;
+        struct resource *res;
+        resource_size_t size;
+        int irq;
+        int error;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "Can't get memory resource\n");
+                return -ENOENT;
+        }
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "Can't get interrupt resource\n");
+                return irq;
+        }
+
+        tsc = kzalloc(sizeof(*tsc), GFP_KERNEL);
+        input = input_allocate_device();
+        if (!tsc || !input) {
+                dev_err(&pdev->dev, "failed allocating memory\n");
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        tsc->dev = input;
+        tsc->irq = irq;
+
+        size = resource_size(res);
+
+        if (!request_mem_region(res->start, size, pdev->name)) {
+                dev_err(&pdev->dev, "TSC registers are not free\n");
+                error = -EBUSY;
+                goto err_free_mem;
+        }
+
+        tsc->tsc_base = ioremap(res->start, size);
+        if (!tsc->tsc_base) {
+                dev_err(&pdev->dev, "Can't map memory\n");
+                error = -ENOMEM;
+                goto err_release_mem;
+        }
+
+        tsc->clk = clk_get(&pdev->dev, NULL);
+        if (IS_ERR(tsc->clk)) {
+                dev_err(&pdev->dev, "failed getting clock\n");
+                error = PTR_ERR(tsc->clk);
+                goto err_unmap;
+        }
+
+        input->name = MOD_NAME;
+        input->phys = "lpc32xx/input0";
+        input->id.bustype = BUS_HOST;
+        input->id.vendor = 0x0001;
+        input->id.product = 0x0002;
+        input->id.version = 0x0100;
+        input->dev.parent = &pdev->dev;
+        input->open = lpc32xx_ts_open;
+        input->close = lpc32xx_ts_close;
+
+        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, LPC32XX_TSC_MIN_XY_VAL,
+                             LPC32XX_TSC_MAX_XY_VAL, 0, 0);
+        input_set_abs_params(input, ABS_Y, LPC32XX_TSC_MIN_XY_VAL,
+                             LPC32XX_TSC_MAX_XY_VAL, 0, 0);
+
+        input_set_drvdata(input, tsc);
+
+        error = request_irq(tsc->irq, lpc32xx_ts_interrupt,
+                            IRQF_DISABLED, pdev->name, tsc);
+        if (error) {
+                dev_err(&pdev->dev, "failed requesting interrupt\n");
+                goto err_put_clock;
+        }
+
+        error = input_register_device(input);
+        if (error) {
+                dev_err(&pdev->dev, "failed registering input device\n");
+                goto err_free_irq;
+        }
+
+        platform_set_drvdata(pdev, tsc);
+        device_init_wakeup(&pdev->dev, 1);
+
+        return 0;
+
+err_free_irq:
+        free_irq(tsc->irq, tsc);
+err_put_clock:
+        clk_put(tsc->clk);
+err_unmap:
+        iounmap(tsc->tsc_base);
+err_release_mem:
+        release_mem_region(res->start, size);
+err_free_mem:
+        input_free_device(input);
+        kfree(tsc);
+
+        return error;
+}
+
+static int __devexit lpc32xx_ts_remove(struct platform_device *pdev)
+{
+        struct lpc32xx_tsc *tsc = platform_get_drvdata(pdev);
+        struct resource *res;
+
+        device_init_wakeup(&pdev->dev, 0);
+        free_irq(tsc->irq, tsc);
+
+        input_unregister_device(tsc->dev);
+
+        clk_put(tsc->clk);
+
+        iounmap(tsc->tsc_base);
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(res->start, resource_size(res));
+
+        kfree(tsc);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int lpc32xx_ts_suspend(struct device *dev)
+{
+        struct lpc32xx_tsc *tsc = dev_get_drvdata(dev);
+        struct input_dev *input = tsc->dev;
+
+        /*
+         * Suspend and resume can be called when the device hasn't been
+         * enabled. If there are no users that have the device open, then
+         * avoid calling the TSC stop and start functions as the TSC
+         * isn't yet clocked.
+         */
+        mutex_lock(&input->mutex);
+
+        if (input->users) {
+                if (device_may_wakeup(dev))
+                        enable_irq_wake(tsc->irq);
+                else
+                        lpc32xx_stop_tsc(tsc);
+        }
+
+        mutex_unlock(&input->mutex);
+
+        return 0;
+}
+
+static int lpc32xx_ts_resume(struct device *dev)
+{
+        struct lpc32xx_tsc *tsc = dev_get_drvdata(dev);
+        struct input_dev *input = tsc->dev;
+
+        mutex_lock(&input->mutex);
+
+        if (input->users) {
+                if (device_may_wakeup(dev))
+                        disable_irq_wake(tsc->irq);
+                else
+                        lpc32xx_setup_tsc(tsc);
+        }
+
+        mutex_unlock(&input->mutex);
+
+        return 0;
+}
+
+static const struct dev_pm_ops lpc32xx_ts_pm_ops = {
+        .suspend        = lpc32xx_ts_suspend,
+        .resume         = lpc32xx_ts_resume,
+};
+#define LPC32XX_TS_PM_OPS (&lpc32xx_ts_pm_ops)
+#else
+#define LPC32XX_TS_PM_OPS NULL
+#endif
+
+static struct platform_driver lpc32xx_ts_driver = {
+        .probe          = lpc32xx_ts_probe,
+        .remove         = __devexit_p(lpc32xx_ts_remove),
+        .driver         = {
+                .name   = MOD_NAME,
+                .owner  = THIS_MODULE,
+                .pm     = LPC32XX_TS_PM_OPS,
+        },
+};
+
+static int __init lpc32xx_ts_init(void)
+{
+        return platform_driver_register(&lpc32xx_ts_driver);
+}
+module_init(lpc32xx_ts_init);
+
+static void __exit lpc32xx_ts_exit(void)
+{
+        platform_driver_unregister(&lpc32xx_ts_driver);
+}
+module_exit(lpc32xx_ts_exit);
+
+MODULE_AUTHOR("Kevin Wells <kevin.wells@nxp.com");
+MODULE_DESCRIPTION("LPC32XX TSC Driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:lpc32xx_ts");
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c
index b6b8b1c7ecea..3242e7076258 100644
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
@@ -219,7 +219,7 @@ static int wm97xx_acc_startup(struct wm97xx *wm)
                 }
 
                 wm->pen_irq = gpio_to_irq(irq);
-                set_irq_type(wm->pen_irq, IRQ_TYPE_EDGE_BOTH);
+                irq_set_irq_type(wm->pen_irq, IRQ_TYPE_EDGE_BOTH);
         } else /* pen irq not supported */
                 pen_int = 0;
 
diff --git a/drivers/input/touchscreen/max11801_ts.c b/drivers/input/touchscreen/max11801_ts.c
new file mode 100644
index 000000000000..4f2713d92791
--- /dev/null
+++ b/drivers/input/touchscreen/max11801_ts.c
@@ -0,0 +1,272 @@
+/*
+ * Driver for MAXI MAX11801 - A Resistive touch screen controller with
+ * i2c interface
+ *
+ * Copyright (C) 2011 Freescale Semiconductor, Inc.
+ * Author: Zhang Jiejing <jiejing.zhang@freescale.com>
+ *
+ * Based on mcs5000_ts.c
+ *
+ * This program 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.
+ */
+
+/*
+ * This driver aims to support the series of MAXI touch chips max11801
+ * through max11803. The main difference between these 4 chips can be
+ * found in the table below:
+ * -----------------------------------------------------
+ * | CHIP     |  AUTO MODE SUPPORT(FIFO) | INTERFACE    |
+ * |----------------------------------------------------|
+ * | max11800 |  YES                     |   SPI        |
+ * | max11801 |  YES                     |   I2C        |
+ * | max11802 |  NO                      |   SPI        |
+ * | max11803 |  NO                      |   I2C        |
+ * ------------------------------------------------------
+ *
+ * Currently, this driver only supports max11801.
+ *
+ * Data Sheet:
+ * http://www.maxim-ic.com/datasheet/index.mvp/id/5943
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/slab.h>
+#include <linux/bitops.h>
+
+/* Register Address define */
+#define GENERNAL_STATUS_REG             0x00
+#define GENERNAL_CONF_REG               0x01
+#define MESURE_RES_CONF_REG             0x02
+#define MESURE_AVER_CONF_REG            0x03
+#define ADC_SAMPLE_TIME_CONF_REG        0x04
+#define PANEL_SETUPTIME_CONF_REG        0x05
+#define DELAY_CONVERSION_CONF_REG       0x06
+#define TOUCH_DETECT_PULLUP_CONF_REG    0x07
+#define AUTO_MODE_TIME_CONF_REG         0x08 /* only for max11800/max11801 */
+#define APERTURE_CONF_REG               0x09 /* only for max11800/max11801 */
+#define AUX_MESURE_CONF_REG             0x0a
+#define OP_MODE_CONF_REG                0x0b
+
+/* FIFO is found only in max11800 and max11801 */
+#define FIFO_RD_CMD                     (0x50 << 1)
+#define MAX11801_FIFO_INT               (1 << 2)
+#define MAX11801_FIFO_OVERFLOW          (1 << 3)
+
+#define XY_BUFSIZE                      4
+#define XY_BUF_OFFSET                   4
+
+#define MAX11801_MAX_X                  0xfff
+#define MAX11801_MAX_Y                  0xfff
+
+#define MEASURE_TAG_OFFSET              2
+#define MEASURE_TAG_MASK                (3 << MEASURE_TAG_OFFSET)
+#define EVENT_TAG_OFFSET                0
+#define EVENT_TAG_MASK                  (3 << EVENT_TAG_OFFSET)
+#define MEASURE_X_TAG                   (0 << MEASURE_TAG_OFFSET)
+#define MEASURE_Y_TAG                   (1 << MEASURE_TAG_OFFSET)
+
+/* These are the state of touch event state machine */
+enum {
+        EVENT_INIT,
+        EVENT_MIDDLE,
+        EVENT_RELEASE,
+        EVENT_FIFO_END
+};
+
+struct max11801_data {
+        struct i2c_client               *client;
+        struct input_dev                *input_dev;
+};
+
+static u8 read_register(struct i2c_client *client, int addr)
+{
+        /* XXX: The chip ignores LSB of register address */
+        return i2c_smbus_read_byte_data(client, addr << 1);
+}
+
+static int max11801_write_reg(struct i2c_client *client, int addr, int data)
+{
+        /* XXX: The chip ignores LSB of register address */
+        return i2c_smbus_write_byte_data(client, addr << 1, data);
+}
+
+static irqreturn_t max11801_ts_interrupt(int irq, void *dev_id)
+{
+        struct max11801_data *data = dev_id;
+        struct i2c_client *client = data->client;
+        int status, i, ret;
+        u8 buf[XY_BUFSIZE];
+        int x = -1;
+        int y = -1;
+
+        status = read_register(data->client, GENERNAL_STATUS_REG);
+
+        if (status & (MAX11801_FIFO_INT | MAX11801_FIFO_OVERFLOW)) {
+                status = read_register(data->client, GENERNAL_STATUS_REG);
+
+                ret = i2c_smbus_read_i2c_block_data(client, FIFO_RD_CMD,
+                                                    XY_BUFSIZE, buf);
+
+                /*
+                 * We should get 4 bytes buffer that contains X,Y
+                 * and event tag
+                 */
+                if (ret < XY_BUFSIZE)
+                        goto out;
+
+                for (i = 0; i < XY_BUFSIZE; i += XY_BUFSIZE / 2) {
+                        if ((buf[i + 1] & MEASURE_TAG_MASK) == MEASURE_X_TAG)
+                                x = (buf[i] << XY_BUF_OFFSET) +
+                                    (buf[i + 1] >> XY_BUF_OFFSET);
+                        else if ((buf[i + 1] & MEASURE_TAG_MASK) == MEASURE_Y_TAG)
+                                y = (buf[i] << XY_BUF_OFFSET) +
+                                    (buf[i + 1] >> XY_BUF_OFFSET);
+                }
+
+                if ((buf[1] & EVENT_TAG_MASK) != (buf[3] & EVENT_TAG_MASK))
+                        goto out;
+
+                switch (buf[1] & EVENT_TAG_MASK) {
+                case EVENT_INIT:
+                        /* fall through */
+                case EVENT_MIDDLE:
+                        input_report_abs(data->input_dev, ABS_X, x);
+                        input_report_abs(data->input_dev, ABS_Y, y);
+                        input_event(data->input_dev, EV_KEY, BTN_TOUCH, 1);
+                        input_sync(data->input_dev);
+                        break;
+
+                case EVENT_RELEASE:
+                        input_event(data->input_dev, EV_KEY, BTN_TOUCH, 0);
+                        input_sync(data->input_dev);
+                        break;
+
+                case EVENT_FIFO_END:
+                        break;
+                }
+        }
+out:
+        return IRQ_HANDLED;
+}
+
+static void __devinit max11801_ts_phy_init(struct max11801_data *data)
+{
+        struct i2c_client *client = data->client;
+
+        /* Average X,Y, take 16 samples, average eight media sample */
+        max11801_write_reg(client, MESURE_AVER_CONF_REG, 0xff);
+        /* X,Y panel setup time set to 20us */
+        max11801_write_reg(client, PANEL_SETUPTIME_CONF_REG, 0x11);
+        /* Rough pullup time (2uS), Fine pullup time (10us)  */
+        max11801_write_reg(client, TOUCH_DETECT_PULLUP_CONF_REG, 0x10);
+        /* Auto mode init period = 5ms , scan period = 5ms*/
+        max11801_write_reg(client, AUTO_MODE_TIME_CONF_REG, 0xaa);
+        /* Aperture X,Y set to +- 4LSB */
+        max11801_write_reg(client, APERTURE_CONF_REG, 0x33);
+        /* Enable Power, enable Automode, enable Aperture, enable Average X,Y */
+        max11801_write_reg(client, OP_MODE_CONF_REG, 0x36);
+}
+
+static int __devinit max11801_ts_probe(struct i2c_client *client,
+                                       const struct i2c_device_id *id)
+{
+        struct max11801_data *data;
+        struct input_dev *input_dev;
+        int error;
+
+        data = kzalloc(sizeof(struct max11801_data), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!data || !input_dev) {
+                dev_err(&client->dev, "Failed to allocate memory\n");
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        data->client = client;
+        data->input_dev = input_dev;
+
+        input_dev->name = "max11801_ts";
+        input_dev->id.bustype = BUS_I2C;
+        input_dev->dev.parent = &client->dev;
+
+        __set_bit(EV_ABS, input_dev->evbit);
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(BTN_TOUCH, input_dev->keybit);
+        input_set_abs_params(input_dev, ABS_X, 0, MAX11801_MAX_X, 0, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, MAX11801_MAX_Y, 0, 0);
+        input_set_drvdata(input_dev, data);
+
+        max11801_ts_phy_init(data);
+
+        error = request_threaded_irq(client->irq, NULL, max11801_ts_interrupt,
+                                     IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+                                     "max11801_ts", data);
+        if (error) {
+                dev_err(&client->dev, "Failed to register interrupt\n");
+                goto err_free_mem;
+        }
+
+        error = input_register_device(data->input_dev);
+        if (error)
+                goto err_free_irq;
+
+        i2c_set_clientdata(client, data);
+        return 0;
+
+err_free_irq:
+        free_irq(client->irq, data);
+err_free_mem:
+        input_free_device(input_dev);
+        kfree(data);
+        return error;
+}
+
+static __devexit int max11801_ts_remove(struct i2c_client *client)
+{
+        struct max11801_data *data = i2c_get_clientdata(client);
+
+        free_irq(client->irq, data);
+        input_unregister_device(data->input_dev);
+        kfree(data);
+
+        return 0;
+}
+
+static const struct i2c_device_id max11801_ts_id[] = {
+        {"max11801", 0},
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, max11801_ts_id);
+
+static struct i2c_driver max11801_ts_driver = {
+        .driver = {
+                .name   = "max11801_ts",
+                .owner  = THIS_MODULE,
+        },
+        .id_table       = max11801_ts_id,
+        .probe          = max11801_ts_probe,
+        .remove         = __devexit_p(max11801_ts_remove),
+};
+
+static int __init max11801_ts_init(void)
+{
+        return i2c_add_driver(&max11801_ts_driver);
+}
+
+static void __exit max11801_ts_exit(void)
+{
+        i2c_del_driver(&max11801_ts_driver);
+}
+
+module_init(max11801_ts_init);
+module_exit(max11801_ts_exit);
+
+MODULE_AUTHOR("Zhang Jiejing <jiejing.zhang@freescale.com>");
+MODULE_DESCRIPTION("Touchscreen driver for MAXI MAX11801 controller");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c
index 6ee9940aaf5b..2d84c80ceb66 100644
--- a/drivers/input/touchscreen/mcs5000_ts.c
+++ b/drivers/input/touchscreen/mcs5000_ts.c
@@ -261,25 +261,27 @@ static int __devexit mcs5000_ts_remove(struct i2c_client *client)
 }
 
 #ifdef CONFIG_PM
-static int mcs5000_ts_suspend(struct i2c_client *client, pm_message_t mesg)
+static int mcs5000_ts_suspend(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
+
         /* Touch sleep mode */
         i2c_smbus_write_byte_data(client, MCS5000_TS_OP_MODE, OP_MODE_SLEEP);
 
         return 0;
 }
 
-static int mcs5000_ts_resume(struct i2c_client *client)
+static int mcs5000_ts_resume(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct mcs5000_ts_data *data = i2c_get_clientdata(client);
 
         mcs5000_ts_phys_init(data);
 
         return 0;
 }
-#else
-#define mcs5000_ts_suspend      NULL
-#define mcs5000_ts_resume       NULL
+
+static SIMPLE_DEV_PM_OPS(mcs5000_ts_pm, mcs5000_ts_suspend, mcs5000_ts_resume);
 #endif
 
 static const struct i2c_device_id mcs5000_ts_id[] = {
@@ -291,10 +293,11 @@ MODULE_DEVICE_TABLE(i2c, mcs5000_ts_id);
 static struct i2c_driver mcs5000_ts_driver = {
         .probe          = mcs5000_ts_probe,
         .remove         = __devexit_p(mcs5000_ts_remove),
-        .suspend        = mcs5000_ts_suspend,
-        .resume         = mcs5000_ts_resume,
         .driver = {
                 .name = "mcs5000_ts",
+#ifdef CONFIG_PM
+                .pm   = &mcs5000_ts_pm,
+#endif
         },
         .id_table       = mcs5000_ts_id,
 };
diff --git a/drivers/input/touchscreen/migor_ts.c b/drivers/input/touchscreen/migor_ts.c
index defe5dd3627c..5803bd0c1cca 100644
--- a/drivers/input/touchscreen/migor_ts.c
+++ b/drivers/input/touchscreen/migor_ts.c
@@ -23,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
+#include <linux/pm.h>
 #include <linux/slab.h>
 #include <asm/io.h>
 #include <linux/i2c.h>
@@ -226,8 +227,9 @@ static int migor_ts_remove(struct i2c_client *client)
         return 0;
 }
 
-static int migor_ts_suspend(struct i2c_client *client, pm_message_t mesg)
+static int migor_ts_suspend(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct migor_ts_priv *priv = dev_get_drvdata(&client->dev);
 
         if (device_may_wakeup(&client->dev))
@@ -236,8 +238,9 @@ static int migor_ts_suspend(struct i2c_client *client, pm_message_t mesg)
         return 0;
 }
 
-static int migor_ts_resume(struct i2c_client *client)
+static int migor_ts_resume(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         struct migor_ts_priv *priv = dev_get_drvdata(&client->dev);
 
         if (device_may_wakeup(&client->dev))
@@ -246,6 +249,8 @@ static int migor_ts_resume(struct i2c_client *client)
         return 0;
 }
 
+static SIMPLE_DEV_PM_OPS(migor_ts_pm, migor_ts_suspend, migor_ts_resume);
+
 static const struct i2c_device_id migor_ts_id[] = {
         { "migor_ts", 0 },
         { }
@@ -255,11 +260,10 @@ MODULE_DEVICE_TABLE(i2c, migor_ts);
 static struct i2c_driver migor_ts_driver = {
         .driver = {
                 .name = "migor_ts",
+                .pm = &migor_ts_pm,
         },
         .probe = migor_ts_probe,
         .remove = migor_ts_remove,
-        .suspend = migor_ts_suspend,
-        .resume = migor_ts_resume,
         .id_table = migor_ts_id,
 };
 
diff --git a/drivers/input/touchscreen/mk712.c b/drivers/input/touchscreen/mk712.c
index efd3aebaba5f..36e57deacd03 100644
--- a/drivers/input/touchscreen/mk712.c
+++ b/drivers/input/touchscreen/mk712.c
@@ -17,7 +17,7 @@
  * found in Gateway AOL Connected Touchpad computers.
  *
  * Documentation for ICS MK712 can be found at:
- *      http://www.icst.com/pdf/mk712.pdf
+ *      http://www.idt.com/products/getDoc.cfm?docID=18713923
  */
 
 /*
diff --git a/drivers/input/touchscreen/qt602240_ts.c b/drivers/input/touchscreen/qt602240_ts.c
deleted file mode 100644
index 66b26ad3032a..000000000000
--- a/drivers/input/touchscreen/qt602240_ts.c
+++ /dev/null
@@ -1,1401 +0,0 @@
-/*
- * AT42QT602240/ATMXT224 Touchscreen driver
- *
- * Copyright (C) 2010 Samsung Electronics Co.Ltd
- * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- *
- * This program 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.
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/firmware.h>
-#include <linux/i2c.h>
-#include <linux/i2c/qt602240_ts.h>
-#include <linux/input.h>
-#include <linux/interrupt.h>
-#include <linux/slab.h>
-
-/* Version */
-#define QT602240_VER_20                 20
-#define QT602240_VER_21                 21
-#define QT602240_VER_22                 22
-
-/* Slave addresses */
-#define QT602240_APP_LOW                0x4a
-#define QT602240_APP_HIGH               0x4b
-#define QT602240_BOOT_LOW               0x24
-#define QT602240_BOOT_HIGH              0x25
-
-/* Firmware */
-#define QT602240_FW_NAME                "qt602240.fw"
-
-/* Registers */
-#define QT602240_FAMILY_ID              0x00
-#define QT602240_VARIANT_ID             0x01
-#define QT602240_VERSION                0x02
-#define QT602240_BUILD                  0x03
-#define QT602240_MATRIX_X_SIZE          0x04
-#define QT602240_MATRIX_Y_SIZE          0x05
-#define QT602240_OBJECT_NUM             0x06
-#define QT602240_OBJECT_START           0x07
-
-#define QT602240_OBJECT_SIZE            6
-
-/* Object types */
-#define QT602240_DEBUG_DIAGNOSTIC       37
-#define QT602240_GEN_MESSAGE            5
-#define QT602240_GEN_COMMAND            6
-#define QT602240_GEN_POWER              7
-#define QT602240_GEN_ACQUIRE            8
-#define QT602240_TOUCH_MULTI            9
-#define QT602240_TOUCH_KEYARRAY         15
-#define QT602240_TOUCH_PROXIMITY        23
-#define QT602240_PROCI_GRIPFACE         20
-#define QT602240_PROCG_NOISE            22
-#define QT602240_PROCI_ONETOUCH         24
-#define QT602240_PROCI_TWOTOUCH         27
-#define QT602240_SPT_COMMSCONFIG        18      /* firmware ver 21 over */
-#define QT602240_SPT_GPIOPWM            19
-#define QT602240_SPT_SELFTEST           25
-#define QT602240_SPT_CTECONFIG          28
-#define QT602240_SPT_USERDATA           38      /* firmware ver 21 over */
-
-/* QT602240_GEN_COMMAND field */
-#define QT602240_COMMAND_RESET          0
-#define QT602240_COMMAND_BACKUPNV       1
-#define QT602240_COMMAND_CALIBRATE      2
-#define QT602240_COMMAND_REPORTALL      3
-#define QT602240_COMMAND_DIAGNOSTIC     5
-
-/* QT602240_GEN_POWER field */
-#define QT602240_POWER_IDLEACQINT       0
-#define QT602240_POWER_ACTVACQINT       1
-#define QT602240_POWER_ACTV2IDLETO      2
-
-/* QT602240_GEN_ACQUIRE field */
-#define QT602240_ACQUIRE_CHRGTIME       0
-#define QT602240_ACQUIRE_TCHDRIFT       2
-#define QT602240_ACQUIRE_DRIFTST        3
-#define QT602240_ACQUIRE_TCHAUTOCAL     4
-#define QT602240_ACQUIRE_SYNC           5
-#define QT602240_ACQUIRE_ATCHCALST      6
-#define QT602240_ACQUIRE_ATCHCALSTHR    7
-
-/* QT602240_TOUCH_MULTI field */
-#define QT602240_TOUCH_CTRL             0
-#define QT602240_TOUCH_XORIGIN          1
-#define QT602240_TOUCH_YORIGIN          2
-#define QT602240_TOUCH_XSIZE            3
-#define QT602240_TOUCH_YSIZE            4
-#define QT602240_TOUCH_BLEN             6
-#define QT602240_TOUCH_TCHTHR           7
-#define QT602240_TOUCH_TCHDI            8
-#define QT602240_TOUCH_ORIENT           9
-#define QT602240_TOUCH_MOVHYSTI         11
-#define QT602240_TOUCH_MOVHYSTN         12
-#define QT602240_TOUCH_NUMTOUCH         14
-#define QT602240_TOUCH_MRGHYST          15
-#define QT602240_TOUCH_MRGTHR           16
-#define QT602240_TOUCH_AMPHYST          17
-#define QT602240_TOUCH_XRANGE_LSB       18
-#define QT602240_TOUCH_XRANGE_MSB       19
-#define QT602240_TOUCH_YRANGE_LSB       20
-#define QT602240_TOUCH_YRANGE_MSB       21
-#define QT602240_TOUCH_XLOCLIP          22
-#define QT602240_TOUCH_XHICLIP          23
-#define QT602240_TOUCH_YLOCLIP          24
-#define QT602240_TOUCH_YHICLIP          25
-#define QT602240_TOUCH_XEDGECTRL        26
-#define QT602240_TOUCH_XEDGEDIST        27
-#define QT602240_TOUCH_YEDGECTRL        28
-#define QT602240_TOUCH_YEDGEDIST        29
-#define QT602240_TOUCH_JUMPLIMIT        30      /* firmware ver 22 over */
-
-/* QT602240_PROCI_GRIPFACE field */
-#define QT602240_GRIPFACE_CTRL          0
-#define QT602240_GRIPFACE_XLOGRIP       1
-#define QT602240_GRIPFACE_XHIGRIP       2
-#define QT602240_GRIPFACE_YLOGRIP       3
-#define QT602240_GRIPFACE_YHIGRIP       4
-#define QT602240_GRIPFACE_MAXTCHS       5
-#define QT602240_GRIPFACE_SZTHR1        7
-#define QT602240_GRIPFACE_SZTHR2        8
-#define QT602240_GRIPFACE_SHPTHR1       9
-#define QT602240_GRIPFACE_SHPTHR2       10
-#define QT602240_GRIPFACE_SUPEXTTO      11
-
-/* QT602240_PROCI_NOISE field */
-#define QT602240_NOISE_CTRL             0
-#define QT602240_NOISE_OUTFLEN          1
-#define QT602240_NOISE_GCAFUL_LSB       3
-#define QT602240_NOISE_GCAFUL_MSB       4
-#define QT602240_NOISE_GCAFLL_LSB       5
-#define QT602240_NOISE_GCAFLL_MSB       6
-#define QT602240_NOISE_ACTVGCAFVALID    7
-#define QT602240_NOISE_NOISETHR         8
-#define QT602240_NOISE_FREQHOPSCALE     10
-#define QT602240_NOISE_FREQ0            11
-#define QT602240_NOISE_FREQ1            12
-#define QT602240_NOISE_FREQ2            13
-#define QT602240_NOISE_FREQ3            14
-#define QT602240_NOISE_FREQ4            15
-#define QT602240_NOISE_IDLEGCAFVALID    16
-
-/* QT602240_SPT_COMMSCONFIG */
-#define QT602240_COMMS_CTRL             0
-#define QT602240_COMMS_CMD              1
-
-/* QT602240_SPT_CTECONFIG field */
-#define QT602240_CTE_CTRL               0
-#define QT602240_CTE_CMD                1
-#define QT602240_CTE_MODE               2
-#define QT602240_CTE_IDLEGCAFDEPTH      3
-#define QT602240_CTE_ACTVGCAFDEPTH      4
-#define QT602240_CTE_VOLTAGE            5       /* firmware ver 21 over */
-
-#define QT602240_VOLTAGE_DEFAULT        2700000
-#define QT602240_VOLTAGE_STEP           10000
-
-/* Define for QT602240_GEN_COMMAND */
-#define QT602240_BOOT_VALUE             0xa5
-#define QT602240_BACKUP_VALUE           0x55
-#define QT602240_BACKUP_TIME            25      /* msec */
-#define QT602240_RESET_TIME             65      /* msec */
-
-#define QT602240_FWRESET_TIME           175     /* msec */
-
-/* Command to unlock bootloader */
-#define QT602240_UNLOCK_CMD_MSB         0xaa
-#define QT602240_UNLOCK_CMD_LSB         0xdc
-
-/* Bootloader mode status */
-#define QT602240_WAITING_BOOTLOAD_CMD   0xc0    /* valid 7 6 bit only */
-#define QT602240_WAITING_FRAME_DATA     0x80    /* valid 7 6 bit only */
-#define QT602240_FRAME_CRC_CHECK        0x02
-#define QT602240_FRAME_CRC_FAIL         0x03
-#define QT602240_FRAME_CRC_PASS         0x04
-#define QT602240_APP_CRC_FAIL           0x40    /* valid 7 8 bit only */
-#define QT602240_BOOT_STATUS_MASK       0x3f
-
-/* Touch status */
-#define QT602240_SUPPRESS               (1 << 1)
-#define QT602240_AMP                    (1 << 2)
-#define QT602240_VECTOR                 (1 << 3)
-#define QT602240_MOVE                   (1 << 4)
-#define QT602240_RELEASE                (1 << 5)
-#define QT602240_PRESS                  (1 << 6)
-#define QT602240_DETECT                 (1 << 7)
-
-/* Touchscreen absolute values */
-#define QT602240_MAX_XC                 0x3ff
-#define QT602240_MAX_YC                 0x3ff
-#define QT602240_MAX_AREA               0xff
-
-#define QT602240_MAX_FINGER             10
-
-/* Initial register values recommended from chip vendor */
-static const u8 init_vals_ver_20[] = {
-        /* QT602240_GEN_COMMAND(6) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_GEN_POWER(7) */
-        0x20, 0xff, 0x32,
-        /* QT602240_GEN_ACQUIRE(8) */
-        0x08, 0x05, 0x05, 0x00, 0x00, 0x00, 0x05, 0x14,
-        /* QT602240_TOUCH_MULTI(9) */
-        0x00, 0x00, 0x00, 0x11, 0x0a, 0x00, 0x00, 0x00, 0x02, 0x00,
-        0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x64,
-        /* QT602240_TOUCH_KEYARRAY(15) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00,
-        /* QT602240_SPT_GPIOPWM(19) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00,
-        /* QT602240_PROCI_GRIPFACE(20) */
-        0x00, 0x64, 0x64, 0x64, 0x64, 0x00, 0x00, 0x1e, 0x14, 0x04,
-        0x1e, 0x00,
-        /* QT602240_PROCG_NOISE(22) */
-        0x05, 0x00, 0x00, 0x19, 0x00, 0xe7, 0xff, 0x04, 0x32, 0x00,
-        0x01, 0x0a, 0x0f, 0x14, 0x00, 0x00, 0xe8,
-        /* QT602240_TOUCH_PROXIMITY(23) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00,
-        /* QT602240_PROCI_ONETOUCH(24) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_SPT_SELFTEST(25) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        /* QT602240_PROCI_TWOTOUCH(27) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_SPT_CTECONFIG(28) */
-        0x00, 0x00, 0x00, 0x04, 0x08,
-};
-
-static const u8 init_vals_ver_21[] = {
-        /* QT602240_GEN_COMMAND(6) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_GEN_POWER(7) */
-        0x20, 0xff, 0x32,
-        /* QT602240_GEN_ACQUIRE(8) */
-        0x0a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x23,
-        /* QT602240_TOUCH_MULTI(9) */
-        0x00, 0x00, 0x00, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00,
-        0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_TOUCH_KEYARRAY(15) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00,
-        /* QT602240_SPT_GPIOPWM(19) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_PROCI_GRIPFACE(20) */
-        0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x28, 0x04,
-        0x0f, 0x0a,
-        /* QT602240_PROCG_NOISE(22) */
-        0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x23, 0x00,
-        0x00, 0x05, 0x0f, 0x19, 0x23, 0x2d, 0x03,
-        /* QT602240_TOUCH_PROXIMITY(23) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00,
-        /* QT602240_PROCI_ONETOUCH(24) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_SPT_SELFTEST(25) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        /* QT602240_PROCI_TWOTOUCH(27) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_SPT_CTECONFIG(28) */
-        0x00, 0x00, 0x00, 0x08, 0x10, 0x00,
-};
-
-static const u8 init_vals_ver_22[] = {
-        /* QT602240_GEN_COMMAND(6) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_GEN_POWER(7) */
-        0x20, 0xff, 0x32,
-        /* QT602240_GEN_ACQUIRE(8) */
-        0x0a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x23,
-        /* QT602240_TOUCH_MULTI(9) */
-        0x00, 0x00, 0x00, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00,
-        0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00,
-        /* QT602240_TOUCH_KEYARRAY(15) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00,
-        /* QT602240_SPT_GPIOPWM(19) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_PROCI_GRIPFACE(20) */
-        0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x28, 0x04,
-        0x0f, 0x0a,
-        /* QT602240_PROCG_NOISE(22) */
-        0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x23, 0x00,
-        0x00, 0x05, 0x0f, 0x19, 0x23, 0x2d, 0x03,
-        /* QT602240_TOUCH_PROXIMITY(23) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_PROCI_ONETOUCH(24) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_SPT_SELFTEST(25) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        /* QT602240_PROCI_TWOTOUCH(27) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        /* QT602240_SPT_CTECONFIG(28) */
-        0x00, 0x00, 0x00, 0x08, 0x10, 0x00,
-};
-
-struct qt602240_info {
-        u8 family_id;
-        u8 variant_id;
-        u8 version;
-        u8 build;
-        u8 matrix_xsize;
-        u8 matrix_ysize;
-        u8 object_num;
-};
-
-struct qt602240_object {
-        u8 type;
-        u16 start_address;
-        u8 size;
-        u8 instances;
-        u8 num_report_ids;
-
-        /* to map object and message */
-        u8 max_reportid;
-};
-
-struct qt602240_message {
-        u8 reportid;
-        u8 message[7];
-        u8 checksum;
-};
-
-struct qt602240_finger {
-        int status;
-        int x;
-        int y;
-        int area;
-};
-
-/* Each client has this additional data */
-struct qt602240_data {
-        struct i2c_client *client;
-        struct input_dev *input_dev;
-        const struct qt602240_platform_data *pdata;
-        struct qt602240_object *object_table;
-        struct qt602240_info info;
-        struct qt602240_finger finger[QT602240_MAX_FINGER];
-        unsigned int irq;
-};
-
-static bool qt602240_object_readable(unsigned int type)
-{
-        switch (type) {
-        case QT602240_GEN_MESSAGE:
-        case QT602240_GEN_COMMAND:
-        case QT602240_GEN_POWER:
-        case QT602240_GEN_ACQUIRE:
-        case QT602240_TOUCH_MULTI:
-        case QT602240_TOUCH_KEYARRAY:
-        case QT602240_TOUCH_PROXIMITY:
-        case QT602240_PROCI_GRIPFACE:
-        case QT602240_PROCG_NOISE:
-        case QT602240_PROCI_ONETOUCH:
-        case QT602240_PROCI_TWOTOUCH:
-        case QT602240_SPT_COMMSCONFIG:
-        case QT602240_SPT_GPIOPWM:
-        case QT602240_SPT_SELFTEST:
-        case QT602240_SPT_CTECONFIG:
-        case QT602240_SPT_USERDATA:
-                return true;
-        default:
-                return false;
-        }
-}
-
-static bool qt602240_object_writable(unsigned int type)
-{
-        switch (type) {
-        case QT602240_GEN_COMMAND:
-        case QT602240_GEN_POWER:
-        case QT602240_GEN_ACQUIRE:
-        case QT602240_TOUCH_MULTI:
-        case QT602240_TOUCH_KEYARRAY:
-        case QT602240_TOUCH_PROXIMITY:
-        case QT602240_PROCI_GRIPFACE:
-        case QT602240_PROCG_NOISE:
-        case QT602240_PROCI_ONETOUCH:
-        case QT602240_PROCI_TWOTOUCH:
-        case QT602240_SPT_GPIOPWM:
-        case QT602240_SPT_SELFTEST:
-        case QT602240_SPT_CTECONFIG:
-                return true;
-        default:
-                return false;
-        }
-}
-
-static void qt602240_dump_message(struct device *dev,
-                                  struct qt602240_message *message)
-{
-        dev_dbg(dev, "reportid:\t0x%x\n", message->reportid);
-        dev_dbg(dev, "message1:\t0x%x\n", message->message[0]);
-        dev_dbg(dev, "message2:\t0x%x\n", message->message[1]);
-        dev_dbg(dev, "message3:\t0x%x\n", message->message[2]);
-        dev_dbg(dev, "message4:\t0x%x\n", message->message[3]);
-        dev_dbg(dev, "message5:\t0x%x\n", message->message[4]);
-        dev_dbg(dev, "message6:\t0x%x\n", message->message[5]);
-        dev_dbg(dev, "message7:\t0x%x\n", message->message[6]);
-        dev_dbg(dev, "checksum:\t0x%x\n", message->checksum);
-}
-
-static int qt602240_check_bootloader(struct i2c_client *client,
-                                     unsigned int state)
-{
-        u8 val;
-
-recheck:
-        if (i2c_master_recv(client, &val, 1) != 1) {
-                dev_err(&client->dev, "%s: i2c recv failed\n", __func__);
-                return -EIO;
-        }
-
-        switch (state) {
-        case QT602240_WAITING_BOOTLOAD_CMD:
-        case QT602240_WAITING_FRAME_DATA:
-                val &= ~QT602240_BOOT_STATUS_MASK;
-                break;
-        case QT602240_FRAME_CRC_PASS:
-                if (val == QT602240_FRAME_CRC_CHECK)
-                        goto recheck;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        if (val != state) {
-                dev_err(&client->dev, "Unvalid bootloader mode state\n");
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static int qt602240_unlock_bootloader(struct i2c_client *client)
-{
-        u8 buf[2];
-
-        buf[0] = QT602240_UNLOCK_CMD_LSB;
-        buf[1] = QT602240_UNLOCK_CMD_MSB;
-
-        if (i2c_master_send(client, buf, 2) != 2) {
-                dev_err(&client->dev, "%s: i2c send failed\n", __func__);
-                return -EIO;
-        }
-
-        return 0;
-}
-
-static int qt602240_fw_write(struct i2c_client *client,
-                             const u8 *data, unsigned int frame_size)
-{
-        if (i2c_master_send(client, data, frame_size) != frame_size) {
-                dev_err(&client->dev, "%s: i2c send failed\n", __func__);
-                return -EIO;
-        }
-
-        return 0;
-}
-
-static int __qt602240_read_reg(struct i2c_client *client,
-                               u16 reg, u16 len, void *val)
-{
-        struct i2c_msg xfer[2];
-        u8 buf[2];
-
-        buf[0] = reg & 0xff;
-        buf[1] = (reg >> 8) & 0xff;
-
-        /* Write register */
-        xfer[0].addr = client->addr;
-        xfer[0].flags = 0;
-        xfer[0].len = 2;
-        xfer[0].buf = buf;
-
-        /* Read data */
-        xfer[1].addr = client->addr;
-        xfer[1].flags = I2C_M_RD;
-        xfer[1].len = len;
-        xfer[1].buf = val;
-
-        if (i2c_transfer(client->adapter, xfer, 2) != 2) {
-                dev_err(&client->dev, "%s: i2c transfer failed\n", __func__);
-                return -EIO;
-        }
-
-        return 0;
-}
-
-static int qt602240_read_reg(struct i2c_client *client, u16 reg, u8 *val)
-{
-        return __qt602240_read_reg(client, reg, 1, val);
-}
-
-static int qt602240_write_reg(struct i2c_client *client, u16 reg, u8 val)
-{
-        u8 buf[3];
-
-        buf[0] = reg & 0xff;
-        buf[1] = (reg >> 8) & 0xff;
-        buf[2] = val;
-
-        if (i2c_master_send(client, buf, 3) != 3) {
-                dev_err(&client->dev, "%s: i2c send failed\n", __func__);
-                return -EIO;
-        }
-
-        return 0;
-}
-
-static int qt602240_read_object_table(struct i2c_client *client,
-                                      u16 reg, u8 *object_buf)
-{
-        return __qt602240_read_reg(client, reg, QT602240_OBJECT_SIZE,
-                                   object_buf);
-}
-
-static struct qt602240_object *
-qt602240_get_object(struct qt602240_data *data, u8 type)
-{
-        struct qt602240_object *object;
-        int i;
-
-        for (i = 0; i < data->info.object_num; i++) {
-                object = data->object_table + i;
-                if (object->type == type)
-                        return object;
-        }
-
-        dev_err(&data->client->dev, "Invalid object type\n");
-        return NULL;
-}
-
-static int qt602240_read_message(struct qt602240_data *data,
-                                 struct qt602240_message *message)
-{
-        struct qt602240_object *object;
-        u16 reg;
-
-        object = qt602240_get_object(data, QT602240_GEN_MESSAGE);
-        if (!object)
-                return -EINVAL;
-
-        reg = object->start_address;
-        return __qt602240_read_reg(data->client, reg,
-                        sizeof(struct qt602240_message), message);
-}
-
-static int qt602240_read_object(struct qt602240_data *data,
-                                u8 type, u8 offset, u8 *val)
-{
-        struct qt602240_object *object;
-        u16 reg;
-
-        object = qt602240_get_object(data, type);
-        if (!object)
-                return -EINVAL;
-
-        reg = object->start_address;
-        return __qt602240_read_reg(data->client, reg + offset, 1, val);
-}
-
-static int qt602240_write_object(struct qt602240_data *data,
-                                 u8 type, u8 offset, u8 val)
-{
-        struct qt602240_object *object;
-        u16 reg;
-
-        object = qt602240_get_object(data, type);
-        if (!object)
-                return -EINVAL;
-
-        reg = object->start_address;
-        return qt602240_write_reg(data->client, reg + offset, val);
-}
-
-static void qt602240_input_report(struct qt602240_data *data, int single_id)
-{
-        struct qt602240_finger *finger = data->finger;
-        struct input_dev *input_dev = data->input_dev;
-        int status = finger[single_id].status;
-        int finger_num = 0;
-        int id;
-
-        for (id = 0; id < QT602240_MAX_FINGER; id++) {
-                if (!finger[id].status)
-                        continue;
-
-                input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR,
-                                finger[id].status != QT602240_RELEASE ?
-                                finger[id].area : 0);
-                input_report_abs(input_dev, ABS_MT_POSITION_X,
-                                finger[id].x);
-                input_report_abs(input_dev, ABS_MT_POSITION_Y,
-                                finger[id].y);
-                input_mt_sync(input_dev);
-
-                if (finger[id].status == QT602240_RELEASE)
-                        finger[id].status = 0;
-                else
-                        finger_num++;
-        }
-
-        input_report_key(input_dev, BTN_TOUCH, finger_num > 0);
-
-        if (status != QT602240_RELEASE) {
-                input_report_abs(input_dev, ABS_X, finger[single_id].x);
-                input_report_abs(input_dev, ABS_Y, finger[single_id].y);
-        }
-
-        input_sync(input_dev);
-}
-
-static void qt602240_input_touchevent(struct qt602240_data *data,
-                                      struct qt602240_message *message, int id)
-{
-        struct qt602240_finger *finger = data->finger;
-        struct device *dev = &data->client->dev;
-        u8 status = message->message[0];
-        int x;
-        int y;
-        int area;
-
-        /* Check the touch is present on the screen */
-        if (!(status & QT602240_DETECT)) {
-                if (status & QT602240_RELEASE) {
-                        dev_dbg(dev, "[%d] released\n", id);
-
-                        finger[id].status = QT602240_RELEASE;
-                        qt602240_input_report(data, id);
-                }
-                return;
-        }
-
-        /* Check only AMP detection */
-        if (!(status & (QT602240_PRESS | QT602240_MOVE)))
-                return;
-
-        x = (message->message[1] << 2) | ((message->message[3] & ~0x3f) >> 6);
-        y = (message->message[2] << 2) | ((message->message[3] & ~0xf3) >> 2);
-        area = message->message[4];
-
-        dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id,
-                status & QT602240_MOVE ? "moved" : "pressed",
-                x, y, area);
-
-        finger[id].status = status & QT602240_MOVE ?
-                                QT602240_MOVE : QT602240_PRESS;
-        finger[id].x = x;
-        finger[id].y = y;
-        finger[id].area = area;
-
-        qt602240_input_report(data, id);
-}
-
-static irqreturn_t qt602240_interrupt(int irq, void *dev_id)
-{
-        struct qt602240_data *data = dev_id;
-        struct qt602240_message message;
-        struct qt602240_object *object;
-        struct device *dev = &data->client->dev;
-        int id;
-        u8 reportid;
-        u8 max_reportid;
-        u8 min_reportid;
-
-        do {
-                if (qt602240_read_message(data, &message)) {
-                        dev_err(dev, "Failed to read message\n");
-                        goto end;
-                }
-
-                reportid = message.reportid;
-
-                /* whether reportid is thing of QT602240_TOUCH_MULTI */
-                object = qt602240_get_object(data, QT602240_TOUCH_MULTI);
-                if (!object)
-                        goto end;
-
-                max_reportid = object->max_reportid;
-                min_reportid = max_reportid - object->num_report_ids + 1;
-                id = reportid - min_reportid;
-
-                if (reportid >= min_reportid && reportid <= max_reportid)
-                        qt602240_input_touchevent(data, &message, id);
-                else
-                        qt602240_dump_message(dev, &message);
-        } while (reportid != 0xff);
-
-end:
-        return IRQ_HANDLED;
-}
-
-static int qt602240_check_reg_init(struct qt602240_data *data)
-{
-        struct qt602240_object *object;
-        struct device *dev = &data->client->dev;
-        int index = 0;
-        int i, j;
-        u8 version = data->info.version;
-        u8 *init_vals;
-
-        switch (version) {
-        case QT602240_VER_20:
-                init_vals = (u8 *)init_vals_ver_20;
-                break;
-        case QT602240_VER_21:
-                init_vals = (u8 *)init_vals_ver_21;
-                break;
-        case QT602240_VER_22:
-                init_vals = (u8 *)init_vals_ver_22;
-                break;
-        default:
-                dev_err(dev, "Firmware version %d doesn't support\n", version);
-                return -EINVAL;
-        }
-
-        for (i = 0; i < data->info.object_num; i++) {
-                object = data->object_table + i;
-
-                if (!qt602240_object_writable(object->type))
-                        continue;
-
-                for (j = 0; j < object->size + 1; j++)
-                        qt602240_write_object(data, object->type, j,
-                                        init_vals[index + j]);
-
-                index += object->size + 1;
-        }
-
-        return 0;
-}
-
-static int qt602240_check_matrix_size(struct qt602240_data *data)
-{
-        const struct qt602240_platform_data *pdata = data->pdata;
-        struct device *dev = &data->client->dev;
-        int mode = -1;
-        int error;
-        u8 val;
-
-        dev_dbg(dev, "Number of X lines: %d\n", pdata->x_line);
-        dev_dbg(dev, "Number of Y lines: %d\n", pdata->y_line);
-
-        switch (pdata->x_line) {
-        case 0 ... 15:
-                if (pdata->y_line <= 14)
-                        mode = 0;
-                break;
-        case 16:
-                if (pdata->y_line <= 12)
-                        mode = 1;
-                if (pdata->y_line == 13 || pdata->y_line == 14)
-                        mode = 0;
-                break;
-        case 17:
-                if (pdata->y_line <= 11)
-                        mode = 2;
-                if (pdata->y_line == 12 || pdata->y_line == 13)
-                        mode = 1;
-                break;
-        case 18:
-                if (pdata->y_line <= 10)
-                        mode = 3;
-                if (pdata->y_line == 11 || pdata->y_line == 12)
-                        mode = 2;
-                break;
-        case 19:
-                if (pdata->y_line <= 9)
-                        mode = 4;
-                if (pdata->y_line == 10 || pdata->y_line == 11)
-                        mode = 3;
-                break;
-        case 20:
-                mode = 4;
-        }
-
-        if (mode < 0) {
-                dev_err(dev, "Invalid X/Y lines\n");
-                return -EINVAL;
-        }
-
-        error = qt602240_read_object(data, QT602240_SPT_CTECONFIG,
-                                QT602240_CTE_MODE, &val);
-        if (error)
-                return error;
-
-        if (mode == val)
-                return 0;
-
-        /* Change the CTE configuration */
-        qt602240_write_object(data, QT602240_SPT_CTECONFIG,
-                        QT602240_CTE_CTRL, 1);
-        qt602240_write_object(data, QT602240_SPT_CTECONFIG,
-                        QT602240_CTE_MODE, mode);
-        qt602240_write_object(data, QT602240_SPT_CTECONFIG,
-                        QT602240_CTE_CTRL, 0);
-
-        return 0;
-}
-
-static int qt602240_make_highchg(struct qt602240_data *data)
-{
-        struct device *dev = &data->client->dev;
-        int count = 10;
-        int error;
-        u8 val;
-
-        /* Read dummy message to make high CHG pin */
-        do {
-                error = qt602240_read_object(data, QT602240_GEN_MESSAGE, 0, &val);
-                if (error)
-                        return error;
-        } while ((val != 0xff) && --count);
-
-        if (!count) {
-                dev_err(dev, "CHG pin isn't cleared\n");
-                return -EBUSY;
-        }
-
-        return 0;
-}
-
-static void qt602240_handle_pdata(struct qt602240_data *data)
-{
-        const struct qt602240_platform_data *pdata = data->pdata;
-        u8 voltage;
-
-        /* Set touchscreen lines */
-        qt602240_write_object(data, QT602240_TOUCH_MULTI, QT602240_TOUCH_XSIZE,
-                        pdata->x_line);
-        qt602240_write_object(data, QT602240_TOUCH_MULTI, QT602240_TOUCH_YSIZE,
-                        pdata->y_line);
-
-        /* Set touchscreen orient */
-        qt602240_write_object(data, QT602240_TOUCH_MULTI, QT602240_TOUCH_ORIENT,
-                        pdata->orient);
-
-        /* Set touchscreen burst length */
-        qt602240_write_object(data, QT602240_TOUCH_MULTI,
-                        QT602240_TOUCH_BLEN, pdata->blen);
-
-        /* Set touchscreen threshold */
-        qt602240_write_object(data, QT602240_TOUCH_MULTI,
-                        QT602240_TOUCH_TCHTHR, pdata->threshold);
-
-        /* Set touchscreen resolution */
-        qt602240_write_object(data, QT602240_TOUCH_MULTI,
-                        QT602240_TOUCH_XRANGE_LSB, (pdata->x_size - 1) & 0xff);
-        qt602240_write_object(data, QT602240_TOUCH_MULTI,
-                        QT602240_TOUCH_XRANGE_MSB, (pdata->x_size - 1) >> 8);
-        qt602240_write_object(data, QT602240_TOUCH_MULTI,
-                        QT602240_TOUCH_YRANGE_LSB, (pdata->y_size - 1) & 0xff);
-        qt602240_write_object(data, QT602240_TOUCH_MULTI,
-                        QT602240_TOUCH_YRANGE_MSB, (pdata->y_size - 1) >> 8);
-
-        /* Set touchscreen voltage */
-        if (data->info.version >= QT602240_VER_21 && pdata->voltage) {
-                if (pdata->voltage < QT602240_VOLTAGE_DEFAULT) {
-                        voltage = (QT602240_VOLTAGE_DEFAULT - pdata->voltage) /
-                                QT602240_VOLTAGE_STEP;
-                        voltage = 0xff - voltage + 1;
-                } else
-                        voltage = (pdata->voltage - QT602240_VOLTAGE_DEFAULT) /
-                                QT602240_VOLTAGE_STEP;
-
-                qt602240_write_object(data, QT602240_SPT_CTECONFIG,
-                                QT602240_CTE_VOLTAGE, voltage);
-        }
-}
-
-static int qt602240_get_info(struct qt602240_data *data)
-{
-        struct i2c_client *client = data->client;
-        struct qt602240_info *info = &data->info;
-        int error;
-        u8 val;
-
-        error = qt602240_read_reg(client, QT602240_FAMILY_ID, &val);
-        if (error)
-                return error;
-        info->family_id = val;
-
-        error = qt602240_read_reg(client, QT602240_VARIANT_ID, &val);
-        if (error)
-                return error;
-        info->variant_id = val;
-
-        error = qt602240_read_reg(client, QT602240_VERSION, &val);
-        if (error)
-                return error;
-        info->version = val;
-
-        error = qt602240_read_reg(client, QT602240_BUILD, &val);
-        if (error)
-                return error;
-        info->build = val;
-
-        error = qt602240_read_reg(client, QT602240_OBJECT_NUM, &val);
-        if (error)
-                return error;
-        info->object_num = val;
-
-        return 0;
-}
-
-static int qt602240_get_object_table(struct qt602240_data *data)
-{
-        int error;
-        int i;
-        u16 reg;
-        u8 reportid = 0;
-        u8 buf[QT602240_OBJECT_SIZE];
-
-        for (i = 0; i < data->info.object_num; i++) {
-                struct qt602240_object *object = data->object_table + i;
-
-                reg = QT602240_OBJECT_START + QT602240_OBJECT_SIZE * i;
-                error = qt602240_read_object_table(data->client, reg, buf);
-                if (error)
-                        return error;
-
-                object->type = buf[0];
-                object->start_address = (buf[2] << 8) | buf[1];
-                object->size = buf[3];
-                object->instances = buf[4];
-                object->num_report_ids = buf[5];
-
-                if (object->num_report_ids) {
-                        reportid += object->num_report_ids *
-                                        (object->instances + 1);
-                        object->max_reportid = reportid;
-                }
-        }
-
-        return 0;
-}
-
-static int qt602240_initialize(struct qt602240_data *data)
-{
-        struct i2c_client *client = data->client;
-        struct qt602240_info *info = &data->info;
-        int error;
-        u8 val;
-
-        error = qt602240_get_info(data);
-        if (error)
-                return error;
-
-        data->object_table = kcalloc(info->object_num,
-                                     sizeof(struct qt602240_data),
-                                     GFP_KERNEL);
-        if (!data->object_table) {
-                dev_err(&client->dev, "Failed to allocate memory\n");
-                return -ENOMEM;
-        }
-
-        /* Get object table information */
-        error = qt602240_get_object_table(data);
-        if (error)
-                return error;
-
-        /* Check register init values */
-        error = qt602240_check_reg_init(data);
-        if (error)
-                return error;
-
-        /* Check X/Y matrix size */
-        error = qt602240_check_matrix_size(data);
-        if (error)
-                return error;
-
-        error = qt602240_make_highchg(data);
-        if (error)
-                return error;
-
-        qt602240_handle_pdata(data);
-
-        /* Backup to memory */
-        qt602240_write_object(data, QT602240_GEN_COMMAND,
-                        QT602240_COMMAND_BACKUPNV,
-                        QT602240_BACKUP_VALUE);
-        msleep(QT602240_BACKUP_TIME);
-
-        /* Soft reset */
-        qt602240_write_object(data, QT602240_GEN_COMMAND,
-                        QT602240_COMMAND_RESET, 1);
-        msleep(QT602240_RESET_TIME);
-
-        /* Update matrix size at info struct */
-        error = qt602240_read_reg(client, QT602240_MATRIX_X_SIZE, &val);
-        if (error)
-                return error;
-        info->matrix_xsize = val;
-
-        error = qt602240_read_reg(client, QT602240_MATRIX_Y_SIZE, &val);
-        if (error)
-                return error;
-        info->matrix_ysize = val;
-
-        dev_info(&client->dev,
-                        "Family ID: %d Variant ID: %d Version: %d Build: %d\n",
-                        info->family_id, info->variant_id, info->version,
-                        info->build);
-
-        dev_info(&client->dev,
-                        "Matrix X Size: %d Matrix Y Size: %d Object Num: %d\n",
-                        info->matrix_xsize, info->matrix_ysize,
-                        info->object_num);
-
-        return 0;
-}
-
-static ssize_t qt602240_object_show(struct device *dev,
-                                    struct device_attribute *attr, char *buf)
-{
-        struct qt602240_data *data = dev_get_drvdata(dev);
-        struct qt602240_object *object;
-        int count = 0;
-        int i, j;
-        int error;
-        u8 val;
-
-        for (i = 0; i < data->info.object_num; i++) {
-                object = data->object_table + i;
-
-                count += sprintf(buf + count,
-                                "Object Table Element %d(Type %d)\n",
-                                i + 1, object->type);
-
-                if (!qt602240_object_readable(object->type)) {
-                        count += sprintf(buf + count, "\n");
-                        continue;
-                }
-
-                for (j = 0; j < object->size + 1; j++) {
-                        error = qt602240_read_object(data,
-                                                object->type, j, &val);
-                        if (error)
-                                return error;
-
-                        count += sprintf(buf + count,
-                                        "  Byte %d: 0x%x (%d)\n", j, val, val);
-                }
-
-                count += sprintf(buf + count, "\n");
-        }
-
-        return count;
-}
-
-static int qt602240_load_fw(struct device *dev, const char *fn)
-{
-        struct qt602240_data *data = dev_get_drvdata(dev);
-        struct i2c_client *client = data->client;
-        const struct firmware *fw = NULL;
-        unsigned int frame_size;
-        unsigned int pos = 0;
-        int ret;
-
-        ret = request_firmware(&fw, fn, dev);
-        if (ret) {
-                dev_err(dev, "Unable to open firmware %s\n", fn);
-                return ret;
-        }
-
-        /* Change to the bootloader mode */
-        qt602240_write_object(data, QT602240_GEN_COMMAND,
-                        QT602240_COMMAND_RESET, QT602240_BOOT_VALUE);
-        msleep(QT602240_RESET_TIME);
-
-        /* Change to slave address of bootloader */
-        if (client->addr == QT602240_APP_LOW)
-                client->addr = QT602240_BOOT_LOW;
-        else
-                client->addr = QT602240_BOOT_HIGH;
-
-        ret = qt602240_check_bootloader(client, QT602240_WAITING_BOOTLOAD_CMD);
-        if (ret)
-                goto out;
-
-        /* Unlock bootloader */
-        qt602240_unlock_bootloader(client);
-
-        while (pos < fw->size) {
-                ret = qt602240_check_bootloader(client,
-                                                QT602240_WAITING_FRAME_DATA);
-                if (ret)
-                        goto out;
-
-                frame_size = ((*(fw->data + pos) << 8) | *(fw->data + pos + 1));
-
-                /* We should add 2 at frame size as the the firmware data is not
-                 * included the CRC bytes.
-                 */
-                frame_size += 2;
-
-                /* Write one frame to device */
-                qt602240_fw_write(client, fw->data + pos, frame_size);
-
-                ret = qt602240_check_bootloader(client,
-                                                QT602240_FRAME_CRC_PASS);
-                if (ret)
-                        goto out;
-
-                pos += frame_size;
-
-                dev_dbg(dev, "Updated %d bytes / %zd bytes\n", pos, fw->size);
-        }
-
-out:
-        release_firmware(fw);
-
-        /* Change to slave address of application */
-        if (client->addr == QT602240_BOOT_LOW)
-                client->addr = QT602240_APP_LOW;
-        else
-                client->addr = QT602240_APP_HIGH;
-
-        return ret;
-}
-
-static ssize_t qt602240_update_fw_store(struct device *dev,
-                                        struct device_attribute *attr,
-                                        const char *buf, size_t count)
-{
-        struct qt602240_data *data = dev_get_drvdata(dev);
-        unsigned int version;
-        int error;
-
-        if (sscanf(buf, "%u", &version) != 1) {
-                dev_err(dev, "Invalid values\n");
-                return -EINVAL;
-        }
-
-        if (data->info.version < QT602240_VER_21 || version < QT602240_VER_21) {
-                dev_err(dev, "FW update supported starting with version 21\n");
-                return -EINVAL;
-        }
-
-        disable_irq(data->irq);
-
-        error = qt602240_load_fw(dev, QT602240_FW_NAME);
-        if (error) {
-                dev_err(dev, "The firmware update failed(%d)\n", error);
-                count = error;
-        } else {
-                dev_dbg(dev, "The firmware update succeeded\n");
-
-                /* Wait for reset */
-                msleep(QT602240_FWRESET_TIME);
-
-                kfree(data->object_table);
-                data->object_table = NULL;
-
-                qt602240_initialize(data);
-        }
-
-        enable_irq(data->irq);
-
-        return count;
-}
-
-static DEVICE_ATTR(object, 0444, qt602240_object_show, NULL);
-static DEVICE_ATTR(update_fw, 0664, NULL, qt602240_update_fw_store);
-
-static struct attribute *qt602240_attrs[] = {
-        &dev_attr_object.attr,
-        &dev_attr_update_fw.attr,
-        NULL
-};
-
-static const struct attribute_group qt602240_attr_group = {
-        .attrs = qt602240_attrs,
-};
-
-static void qt602240_start(struct qt602240_data *data)
-{
-        /* Touch enable */
-        qt602240_write_object(data,
-                        QT602240_TOUCH_MULTI, QT602240_TOUCH_CTRL, 0x83);
-}
-
-static void qt602240_stop(struct qt602240_data *data)
-{
-        /* Touch disable */
-        qt602240_write_object(data,
-                        QT602240_TOUCH_MULTI, QT602240_TOUCH_CTRL, 0);
-}
-
-static int qt602240_input_open(struct input_dev *dev)
-{
-        struct qt602240_data *data = input_get_drvdata(dev);
-
-        qt602240_start(data);
-
-        return 0;
-}
-
-static void qt602240_input_close(struct input_dev *dev)
-{
-        struct qt602240_data *data = input_get_drvdata(dev);
-
-        qt602240_stop(data);
-}
-
-static int __devinit qt602240_probe(struct i2c_client *client,
-                const struct i2c_device_id *id)
-{
-        struct qt602240_data *data;
-        struct input_dev *input_dev;
-        int error;
-
-        if (!client->dev.platform_data)
-                return -EINVAL;
-
-        data = kzalloc(sizeof(struct qt602240_data), GFP_KERNEL);
-        input_dev = input_allocate_device();
-        if (!data || !input_dev) {
-                dev_err(&client->dev, "Failed to allocate memory\n");
-                error = -ENOMEM;
-                goto err_free_mem;
-        }
-
-        input_dev->name = "AT42QT602240/ATMXT224 Touchscreen";
-        input_dev->id.bustype = BUS_I2C;
-        input_dev->dev.parent = &client->dev;
-        input_dev->open = qt602240_input_open;
-        input_dev->close = qt602240_input_close;
-
-        __set_bit(EV_ABS, input_dev->evbit);
-        __set_bit(EV_KEY, input_dev->evbit);
-        __set_bit(BTN_TOUCH, input_dev->keybit);
-
-        /* For single touch */
-        input_set_abs_params(input_dev, ABS_X,
-                             0, QT602240_MAX_XC, 0, 0);
-        input_set_abs_params(input_dev, ABS_Y,
-                             0, QT602240_MAX_YC, 0, 0);
-
-        /* For multi touch */
-        input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
-                             0, QT602240_MAX_AREA, 0, 0);
-        input_set_abs_params(input_dev, ABS_MT_POSITION_X,
-                             0, QT602240_MAX_XC, 0, 0);
-        input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
-                             0, QT602240_MAX_YC, 0, 0);
-
-        input_set_drvdata(input_dev, data);
-
-        data->client = client;
-        data->input_dev = input_dev;
-        data->pdata = client->dev.platform_data;
-        data->irq = client->irq;
-
-        i2c_set_clientdata(client, data);
-
-        error = qt602240_initialize(data);
-        if (error)
-                goto err_free_object;
-
-        error = request_threaded_irq(client->irq, NULL, qt602240_interrupt,
-                        IRQF_TRIGGER_FALLING, client->dev.driver->name, data);
-        if (error) {
-                dev_err(&client->dev, "Failed to register interrupt\n");
-                goto err_free_object;
-        }
-
-        error = input_register_device(input_dev);
-        if (error)
-                goto err_free_irq;
-
-        error = sysfs_create_group(&client->dev.kobj, &qt602240_attr_group);
-        if (error)
-                goto err_unregister_device;
-
-        return 0;
-
-err_unregister_device:
-        input_unregister_device(input_dev);
-        input_dev = NULL;
-err_free_irq:
-        free_irq(client->irq, data);
-err_free_object:
-        kfree(data->object_table);
-err_free_mem:
-        input_free_device(input_dev);
-        kfree(data);
-        return error;
-}
-
-static int __devexit qt602240_remove(struct i2c_client *client)
-{
-        struct qt602240_data *data = i2c_get_clientdata(client);
-
-        sysfs_remove_group(&client->dev.kobj, &qt602240_attr_group);
-        free_irq(data->irq, data);
-        input_unregister_device(data->input_dev);
-        kfree(data->object_table);
-        kfree(data);
-
-        return 0;
-}
-
-#ifdef CONFIG_PM
-static int qt602240_suspend(struct i2c_client *client, pm_message_t mesg)
-{
-        struct qt602240_data *data = i2c_get_clientdata(client);
-        struct input_dev *input_dev = data->input_dev;
-
-        mutex_lock(&input_dev->mutex);
-
-        if (input_dev->users)
-                qt602240_stop(data);
-
-        mutex_unlock(&input_dev->mutex);
-
-        return 0;
-}
-
-static int qt602240_resume(struct i2c_client *client)
-{
-        struct qt602240_data *data = i2c_get_clientdata(client);
-        struct input_dev *input_dev = data->input_dev;
-
-        /* Soft reset */
-        qt602240_write_object(data, QT602240_GEN_COMMAND,
-                        QT602240_COMMAND_RESET, 1);
-
-        msleep(QT602240_RESET_TIME);
-
-        mutex_lock(&input_dev->mutex);
-
-        if (input_dev->users)
-                qt602240_start(data);
-
-        mutex_unlock(&input_dev->mutex);
-
-        return 0;
-}
-#else
-#define qt602240_suspend        NULL
-#define qt602240_resume         NULL
-#endif
-
-static const struct i2c_device_id qt602240_id[] = {
-        { "qt602240_ts", 0 },
-        { }
-};
-MODULE_DEVICE_TABLE(i2c, qt602240_id);
-
-static struct i2c_driver qt602240_driver = {
-        .driver = {
-                .name   = "qt602240_ts",
-                .owner  = THIS_MODULE,
-        },
-        .probe          = qt602240_probe,
-        .remove         = __devexit_p(qt602240_remove),
-        .suspend        = qt602240_suspend,
-        .resume         = qt602240_resume,
-        .id_table       = qt602240_id,
-};
-
-static int __init qt602240_init(void)
-{
-        return i2c_add_driver(&qt602240_driver);
-}
-
-static void __exit qt602240_exit(void)
-{
-        i2c_del_driver(&qt602240_driver);
-}
-
-module_init(qt602240_init);
-module_exit(qt602240_exit);
-
-/* Module information */
-MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>");
-MODULE_DESCRIPTION("AT42QT602240/ATMXT224 Touchscreen driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 6085d12fd561..8feb7f3c8be1 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -350,7 +350,7 @@ static int __devinit s3c2410ts_probe(struct platform_device *pdev)
  err_tcirq:
         free_irq(ts.irq_tc, ts.input);
  err_inputdev:
-        input_unregister_device(ts.input);
+        input_free_device(ts.input);
  err_iomap:
         iounmap(ts.io);
  err_clk:
diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
new file mode 100644
index 000000000000..4ab371358b33
--- /dev/null
+++ b/drivers/input/touchscreen/st1232.c
@@ -0,0 +1,274 @@
+/*
+ * ST1232 Touchscreen Controller Driver
+ *
+ * Copyright (C) 2010 Renesas Solutions Corp.
+ *      Tony SIM <chinyeow.sim.xt@renesas.com>
+ *
+ * Using code from:
+ *  - android.git.kernel.org: projects/kernel/common.git: synaptics_i2c_rmi.c
+ *      Copyright (C) 2007 Google, 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.
+ *
+ * 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.
+ */
+
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+
+#define ST1232_TS_NAME  "st1232-ts"
+
+#define MIN_X           0x00
+#define MIN_Y           0x00
+#define MAX_X           0x31f   /* (800 - 1) */
+#define MAX_Y           0x1df   /* (480 - 1) */
+#define MAX_AREA        0xff
+#define MAX_FINGERS     2
+
+struct st1232_ts_finger {
+        u16 x;
+        u16 y;
+        u8 t;
+        bool is_valid;
+};
+
+struct st1232_ts_data {
+        struct i2c_client *client;
+        struct input_dev *input_dev;
+        struct st1232_ts_finger finger[MAX_FINGERS];
+};
+
+static int st1232_ts_read_data(struct st1232_ts_data *ts)
+{
+        struct st1232_ts_finger *finger = ts->finger;
+        struct i2c_client *client = ts->client;
+        struct i2c_msg msg[2];
+        int error;
+        u8 start_reg;
+        u8 buf[10];
+
+        /* read touchscreen data from ST1232 */
+        msg[0].addr = client->addr;
+        msg[0].flags = 0;
+        msg[0].len = 1;
+        msg[0].buf = &start_reg;
+        start_reg = 0x10;
+
+        msg[1].addr = ts->client->addr;
+        msg[1].flags = I2C_M_RD;
+        msg[1].len = sizeof(buf);
+        msg[1].buf = buf;
+
+        error = i2c_transfer(client->adapter, msg, 2);
+        if (error < 0)
+                return error;
+
+        /* get "valid" bits */
+        finger[0].is_valid = buf[2] >> 7;
+        finger[1].is_valid = buf[5] >> 7;
+
+        /* get xy coordinate */
+        if (finger[0].is_valid) {
+                finger[0].x = ((buf[2] & 0x0070) << 4) | buf[3];
+                finger[0].y = ((buf[2] & 0x0007) << 8) | buf[4];
+                finger[0].t = buf[8];
+        }
+
+        if (finger[1].is_valid) {
+                finger[1].x = ((buf[5] & 0x0070) << 4) | buf[6];
+                finger[1].y = ((buf[5] & 0x0007) << 8) | buf[7];
+                finger[1].t = buf[9];
+        }
+
+        return 0;
+}
+
+static irqreturn_t st1232_ts_irq_handler(int irq, void *dev_id)
+{
+        struct st1232_ts_data *ts = dev_id;
+        struct st1232_ts_finger *finger = ts->finger;
+        struct input_dev *input_dev = ts->input_dev;
+        int count = 0;
+        int i, ret;
+
+        ret = st1232_ts_read_data(ts);
+        if (ret < 0)
+                goto end;
+
+        /* multi touch protocol */
+        for (i = 0; i < MAX_FINGERS; i++) {
+                if (!finger[i].is_valid)
+                        continue;
+
+                input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, finger[i].t);
+                input_report_abs(input_dev, ABS_MT_POSITION_X, finger[i].x);
+                input_report_abs(input_dev, ABS_MT_POSITION_Y, finger[i].y);
+                input_mt_sync(input_dev);
+                count++;
+        }
+
+        /* SYN_MT_REPORT only if no contact */
+        if (!count)
+                input_mt_sync(input_dev);
+
+        /* SYN_REPORT */
+        input_sync(input_dev);
+
+end:
+        return IRQ_HANDLED;
+}
+
+static int __devinit st1232_ts_probe(struct i2c_client *client,
+                                        const struct i2c_device_id *id)
+{
+        struct st1232_ts_data *ts;
+        struct input_dev *input_dev;
+        int error;
+
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
+                dev_err(&client->dev, "need I2C_FUNC_I2C\n");
+                return -EIO;
+        }
+
+        if (!client->irq) {
+                dev_err(&client->dev, "no IRQ?\n");
+                return -EINVAL;
+        }
+
+
+        ts = kzalloc(sizeof(struct st1232_ts_data), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!ts || !input_dev) {
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        ts->client = client;
+        ts->input_dev = input_dev;
+
+        input_dev->name = "st1232-touchscreen";
+        input_dev->id.bustype = BUS_I2C;
+        input_dev->dev.parent = &client->dev;
+
+        __set_bit(EV_SYN, input_dev->evbit);
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(EV_ABS, input_dev->evbit);
+
+        input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, MAX_AREA, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_POSITION_X, MIN_X, MAX_X, 0, 0);
+        input_set_abs_params(input_dev, ABS_MT_POSITION_Y, MIN_Y, MAX_Y, 0, 0);
+
+        error = request_threaded_irq(client->irq, NULL, st1232_ts_irq_handler,
+                                     IRQF_ONESHOT, client->name, ts);
+        if (error) {
+                dev_err(&client->dev, "Failed to register interrupt\n");
+                goto err_free_mem;
+        }
+
+        error = input_register_device(ts->input_dev);
+        if (error) {
+                dev_err(&client->dev, "Unable to register %s input device\n",
+                        input_dev->name);
+                goto err_free_irq;
+        }
+
+        i2c_set_clientdata(client, ts);
+        device_init_wakeup(&client->dev, 1);
+
+        return 0;
+
+err_free_irq:
+        free_irq(client->irq, ts);
+err_free_mem:
+        input_free_device(input_dev);
+        kfree(ts);
+        return error;
+}
+
+static int __devexit st1232_ts_remove(struct i2c_client *client)
+{
+        struct st1232_ts_data *ts = i2c_get_clientdata(client);
+
+        device_init_wakeup(&client->dev, 0);
+        free_irq(client->irq, ts);
+        input_unregister_device(ts->input_dev);
+        kfree(ts);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int st1232_ts_suspend(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+
+        if (device_may_wakeup(&client->dev))
+                enable_irq_wake(client->irq);
+        else
+                disable_irq(client->irq);
+
+        return 0;
+}
+
+static int st1232_ts_resume(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+
+        if (device_may_wakeup(&client->dev))
+                disable_irq_wake(client->irq);
+        else
+                enable_irq(client->irq);
+
+        return 0;
+}
+
+static const struct dev_pm_ops st1232_ts_pm_ops = {
+        .suspend        = st1232_ts_suspend,
+        .resume         = st1232_ts_resume,
+};
+#endif
+
+static const struct i2c_device_id st1232_ts_id[] = {
+        { ST1232_TS_NAME, 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, st1232_ts_id);
+
+static struct i2c_driver st1232_ts_driver = {
+        .probe          = st1232_ts_probe,
+        .remove         = __devexit_p(st1232_ts_remove),
+        .id_table       = st1232_ts_id,
+        .driver = {
+                .name   = ST1232_TS_NAME,
+                .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     = &st1232_ts_pm_ops,
+#endif
+        },
+};
+
+static int __init st1232_ts_init(void)
+{
+        return i2c_add_driver(&st1232_ts_driver);
+}
+module_init(st1232_ts_init);
+
+static void __exit st1232_ts_exit(void)
+{
+        i2c_del_driver(&st1232_ts_driver);
+}
+module_exit(st1232_ts_exit);
+
+MODULE_AUTHOR("Tony SIM <chinyeow.sim.xt@renesas.com>");
+MODULE_DESCRIPTION("SITRONIX ST1232 Touchscreen Controller Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c
index 656148ec0027..ae88e13c99ff 100644
--- a/drivers/input/touchscreen/stmpe-ts.c
+++ b/drivers/input/touchscreen/stmpe-ts.c
@@ -268,7 +268,7 @@ static int __devinit stmpe_input_probe(struct platform_device *pdev)
         struct stmpe_touch *ts;
         struct input_dev *idev;
         struct stmpe_ts_platform_data *ts_pdata = NULL;
-        int ret = 0;
+        int ret;
         int ts_irq;
 
         ts_irq = platform_get_irq_byname(pdev, "FIFO_TH");
@@ -276,12 +276,16 @@ static int __devinit stmpe_input_probe(struct platform_device *pdev)
                 return ts_irq;
 
         ts = kzalloc(sizeof(*ts), GFP_KERNEL);
-        if (!ts)
+        if (!ts) {
+                ret = -ENOMEM;
                 goto err_out;
+        }
 
         idev = input_allocate_device();
-        if (!idev)
+        if (!idev) {
+                ret = -ENOMEM;
                 goto err_free_ts;
+        }
 
         platform_set_drvdata(pdev, ts);
         ts->stmpe = stmpe;
@@ -361,7 +365,6 @@ static int __devexit stmpe_ts_remove(struct platform_device *pdev)
         platform_set_drvdata(pdev, NULL);
 
         input_unregister_device(ts->idev);
-        input_free_device(ts->idev);
 
         kfree(ts);
 
diff --git a/drivers/input/touchscreen/tnetv107x-ts.c b/drivers/input/touchscreen/tnetv107x-ts.c
new file mode 100644
index 000000000000..22a3411e93c5
--- /dev/null
+++ b/drivers/input/touchscreen/tnetv107x-ts.c
@@ -0,0 +1,397 @@
+/*
+ * Texas Instruments TNETV107X Touchscreen Driver
+ *
+ * Copyright (C) 2010 Texas Instruments
+ *
+ * This program 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 version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <linux/errno.h>
+#include <linux/input.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/ctype.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+
+#include <mach/tnetv107x.h>
+
+#define TSC_PENUP_POLL          (HZ / 5)
+#define IDLE_TIMEOUT            100 /* msec */
+
+/*
+ * The first and last samples of a touch interval are usually garbage and need
+ * to be filtered out with these devices.  The following definitions control
+ * the number of samples skipped.
+ */
+#define TSC_HEAD_SKIP           1
+#define TSC_TAIL_SKIP           1
+#define TSC_SKIP                (TSC_HEAD_SKIP + TSC_TAIL_SKIP + 1)
+#define TSC_SAMPLES             (TSC_SKIP + 1)
+
+/* Register Offsets */
+struct tsc_regs {
+        u32     rev;
+        u32     tscm;
+        u32     bwcm;
+        u32     swc;
+        u32     adcchnl;
+        u32     adcdata;
+        u32     chval[4];
+};
+
+/* TSC Mode Configuration Register (tscm) bits */
+#define WMODE           BIT(0)
+#define TSKIND          BIT(1)
+#define ZMEASURE_EN     BIT(2)
+#define IDLE            BIT(3)
+#define TSC_EN          BIT(4)
+#define STOP            BIT(5)
+#define ONE_SHOT        BIT(6)
+#define SINGLE          BIT(7)
+#define AVG             BIT(8)
+#define AVGNUM(x)       (((x) & 0x03) <<  9)
+#define PVSTC(x)        (((x) & 0x07) << 11)
+#define PON             BIT(14)
+#define PONBG           BIT(15)
+#define AFERST          BIT(16)
+
+/* ADC DATA Capture Register bits */
+#define DATA_VALID      BIT(16)
+
+/* Register Access Macros */
+#define tsc_read(ts, reg)               __raw_readl(&(ts)->regs->reg)
+#define tsc_write(ts, reg, val)         __raw_writel(val, &(ts)->regs->reg);
+#define tsc_set_bits(ts, reg, val)      \
+        tsc_write(ts, reg, tsc_read(ts, reg) | (val))
+#define tsc_clr_bits(ts, reg, val)      \
+        tsc_write(ts, reg, tsc_read(ts, reg) & ~(val))
+
+struct sample {
+        int x, y, p;
+};
+
+struct tsc_data {
+        struct input_dev                *input_dev;
+        struct resource                 *res;
+        struct tsc_regs __iomem         *regs;
+        struct timer_list               timer;
+        spinlock_t                      lock;
+        struct clk                      *clk;
+        struct device                   *dev;
+        int                             sample_count;
+        struct sample                   samples[TSC_SAMPLES];
+        int                             tsc_irq;
+};
+
+static int tsc_read_sample(struct tsc_data *ts, struct sample* sample)
+{
+        int     x, y, z1, z2, t, p = 0;
+        u32     val;
+
+        val = tsc_read(ts, chval[0]);
+        if (val & DATA_VALID)
+                x = val & 0xffff;
+        else
+                return -EINVAL;
+
+        y  = tsc_read(ts, chval[1]) & 0xffff;
+        z1 = tsc_read(ts, chval[2]) & 0xffff;
+        z2 = tsc_read(ts, chval[3]) & 0xffff;
+
+        if (z1) {
+                t = ((600 * x) * (z2 - z1));
+                p = t / (u32) (z1 << 12);
+                if (p < 0)
+                        p = 0;
+        }
+
+        sample->x  = x;
+        sample->y  = y;
+        sample->p  = p;
+
+        return 0;
+}
+
+static void tsc_poll(unsigned long data)
+{
+        struct tsc_data *ts = (struct tsc_data *)data;
+        unsigned long flags;
+        int i, val, x, y, p;
+
+        spin_lock_irqsave(&ts->lock, flags);
+
+        if (ts->sample_count >= TSC_SKIP) {
+                input_report_abs(ts->input_dev, ABS_PRESSURE, 0);
+                input_report_key(ts->input_dev, BTN_TOUCH, 0);
+                input_sync(ts->input_dev);
+        } else if (ts->sample_count > 0) {
+                /*
+                 * A touch event lasted less than our skip count.  Salvage and
+                 * report anyway.
+                 */
+                for (i = 0, val = 0; i < ts->sample_count; i++)
+                        val += ts->samples[i].x;
+                x = val / ts->sample_count;
+
+                for (i = 0, val = 0; i < ts->sample_count; i++)
+                        val += ts->samples[i].y;
+                y = val / ts->sample_count;
+
+                for (i = 0, val = 0; i < ts->sample_count; i++)
+                        val += ts->samples[i].p;
+                p = val / ts->sample_count;
+
+                input_report_abs(ts->input_dev, ABS_X, x);
+                input_report_abs(ts->input_dev, ABS_Y, y);
+                input_report_abs(ts->input_dev, ABS_PRESSURE, p);
+                input_report_key(ts->input_dev, BTN_TOUCH, 1);
+                input_sync(ts->input_dev);
+        }
+
+        ts->sample_count = 0;
+
+        spin_unlock_irqrestore(&ts->lock, flags);
+}
+
+static irqreturn_t tsc_irq(int irq, void *dev_id)
+{
+        struct tsc_data *ts = (struct tsc_data *)dev_id;
+        struct sample *sample;
+        int index;
+
+        spin_lock(&ts->lock);
+
+        index = ts->sample_count % TSC_SAMPLES;
+        sample = &ts->samples[index];
+        if (tsc_read_sample(ts, sample) < 0)
+                goto out;
+
+        if (++ts->sample_count >= TSC_SKIP) {
+                index = (ts->sample_count - TSC_TAIL_SKIP - 1) % TSC_SAMPLES;
+                sample = &ts->samples[index];
+
+                input_report_abs(ts->input_dev, ABS_X, sample->x);
+                input_report_abs(ts->input_dev, ABS_Y, sample->y);
+                input_report_abs(ts->input_dev, ABS_PRESSURE, sample->p);
+                if (ts->sample_count == TSC_SKIP)
+                        input_report_key(ts->input_dev, BTN_TOUCH, 1);
+                input_sync(ts->input_dev);
+        }
+        mod_timer(&ts->timer, jiffies + TSC_PENUP_POLL);
+out:
+        spin_unlock(&ts->lock);
+        return IRQ_HANDLED;
+}
+
+static int tsc_start(struct input_dev *dev)
+{
+        struct tsc_data *ts = input_get_drvdata(dev);
+        unsigned long timeout = jiffies + msecs_to_jiffies(IDLE_TIMEOUT);
+        u32 val;
+
+        clk_enable(ts->clk);
+
+        /* Go to idle mode, before any initialization */
+        while (time_after(timeout, jiffies)) {
+                if (tsc_read(ts, tscm) & IDLE)
+                        break;
+        }
+
+        if (time_before(timeout, jiffies)) {
+                dev_warn(ts->dev, "timeout waiting for idle\n");
+                clk_disable(ts->clk);
+                return -EIO;
+        }
+
+        /* Configure TSC Control register*/
+        val = (PONBG | PON | PVSTC(4) | ONE_SHOT | ZMEASURE_EN);
+        tsc_write(ts, tscm, val);
+
+        /* Bring TSC out of reset: Clear AFE reset bit */
+        val &= ~(AFERST);
+        tsc_write(ts, tscm, val);
+
+        /* Configure all pins for hardware control*/
+        tsc_write(ts, bwcm, 0);
+
+        /* Finally enable the TSC */
+        tsc_set_bits(ts, tscm, TSC_EN);
+
+        return 0;
+}
+
+static void tsc_stop(struct input_dev *dev)
+{
+        struct tsc_data *ts = input_get_drvdata(dev);
+
+        tsc_clr_bits(ts, tscm, TSC_EN);
+        synchronize_irq(ts->tsc_irq);
+        del_timer_sync(&ts->timer);
+        clk_disable(ts->clk);
+}
+
+static int __devinit tsc_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct tsc_data *ts;
+        int error = 0;
+        u32 rev = 0;
+
+        ts = kzalloc(sizeof(struct tsc_data), GFP_KERNEL);
+        if (!ts) {
+                dev_err(dev, "cannot allocate device info\n");
+                return -ENOMEM;
+        }
+
+        ts->dev = dev;
+        spin_lock_init(&ts->lock);
+        setup_timer(&ts->timer, tsc_poll, (unsigned long)ts);
+        platform_set_drvdata(pdev, ts);
+
+        ts->tsc_irq = platform_get_irq(pdev, 0);
+        if (ts->tsc_irq < 0) {
+                dev_err(dev, "cannot determine device interrupt\n");
+                error = -ENODEV;
+                goto error_res;
+        }
+
+        ts->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!ts->res) {
+                dev_err(dev, "cannot determine register area\n");
+                error = -ENODEV;
+                goto error_res;
+        }
+
+        if (!request_mem_region(ts->res->start, resource_size(ts->res),
+                                pdev->name)) {
+                dev_err(dev, "cannot claim register memory\n");
+                ts->res = NULL;
+                error = -EINVAL;
+                goto error_res;
+        }
+
+        ts->regs = ioremap(ts->res->start, resource_size(ts->res));
+        if (!ts->regs) {
+                dev_err(dev, "cannot map register memory\n");
+                error = -ENOMEM;
+                goto error_map;
+        }
+
+        ts->clk = clk_get(dev, NULL);
+        if (IS_ERR(ts->clk)) {
+                dev_err(dev, "cannot claim device clock\n");
+                error = PTR_ERR(ts->clk);
+                goto error_clk;
+        }
+
+        error = request_threaded_irq(ts->tsc_irq, NULL, tsc_irq, 0,
+                                     dev_name(dev), ts);
+        if (error < 0) {
+                dev_err(ts->dev, "Could not allocate ts irq\n");
+                goto error_irq;
+        }
+
+        ts->input_dev = input_allocate_device();
+        if (!ts->input_dev) {
+                dev_err(dev, "cannot allocate input device\n");
+                error = -ENOMEM;
+                goto error_input;
+        }
+        input_set_drvdata(ts->input_dev, ts);
+
+        ts->input_dev->name       = pdev->name;
+        ts->input_dev->id.bustype = BUS_HOST;
+        ts->input_dev->dev.parent = &pdev->dev;
+        ts->input_dev->open       = tsc_start;
+        ts->input_dev->close      = tsc_stop;
+
+        clk_enable(ts->clk);
+        rev = tsc_read(ts, rev);
+        ts->input_dev->id.product = ((rev >>  8) & 0x07);
+        ts->input_dev->id.version = ((rev >> 16) & 0xfff);
+        clk_disable(ts->clk);
+
+        __set_bit(EV_KEY,    ts->input_dev->evbit);
+        __set_bit(EV_ABS,    ts->input_dev->evbit);
+        __set_bit(BTN_TOUCH, ts->input_dev->keybit);
+
+        input_set_abs_params(ts->input_dev, ABS_X, 0, 0xffff, 5, 0);
+        input_set_abs_params(ts->input_dev, ABS_Y, 0, 0xffff, 5, 0);
+        input_set_abs_params(ts->input_dev, ABS_PRESSURE, 0, 4095, 128, 0);
+
+        error = input_register_device(ts->input_dev);
+        if (error < 0) {
+                dev_err(dev, "failed input device registration\n");
+                goto error_reg;
+        }
+
+        return 0;
+
+error_reg:
+        input_free_device(ts->input_dev);
+error_input:
+        free_irq(ts->tsc_irq, ts);
+error_irq:
+        clk_put(ts->clk);
+error_clk:
+        iounmap(ts->regs);
+error_map:
+        release_mem_region(ts->res->start, resource_size(ts->res));
+error_res:
+        platform_set_drvdata(pdev, NULL);
+        kfree(ts);
+
+        return error;
+}
+
+static int __devexit tsc_remove(struct platform_device *pdev)
+{
+        struct tsc_data *ts = platform_get_drvdata(pdev);
+
+        input_unregister_device(ts->input_dev);
+        free_irq(ts->tsc_irq, ts);
+        clk_put(ts->clk);
+        iounmap(ts->regs);
+        release_mem_region(ts->res->start, resource_size(ts->res));
+        platform_set_drvdata(pdev, NULL);
+        kfree(ts);
+
+        return 0;
+}
+
+static struct platform_driver tsc_driver = {
+        .probe          = tsc_probe,
+        .remove         = __devexit_p(tsc_remove),
+        .driver.name    = "tnetv107x-ts",
+        .driver.owner   = THIS_MODULE,
+};
+
+static int __init tsc_init(void)
+{
+        return platform_driver_register(&tsc_driver);
+}
+
+static void __exit tsc_exit(void)
+{
+        platform_driver_unregister(&tsc_driver);
+}
+
+module_init(tsc_init);
+module_exit(tsc_exit);
+
+MODULE_AUTHOR("Cyril Chemparathy");
+MODULE_DESCRIPTION("TNETV107X Touchscreen Driver");
+MODULE_ALIAS("platform: tnetv107x-ts");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index a644d18c04dc..43031492d733 100644
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -43,7 +43,6 @@ struct tps6507x_ts {
         struct input_dev        *input_dev;
         struct device           *dev;
         char                    phys[32];
-        struct workqueue_struct *wq;
         struct delayed_work     work;
         unsigned                polling;        /* polling is active */
         struct ts_event         tc;
@@ -220,8 +219,8 @@ done:
         poll = 1;
 
         if (poll) {
-                schd = queue_delayed_work(tsc->wq, &tsc->work,
-                                          msecs_to_jiffies(tsc->poll_period));
+                schd = schedule_delayed_work(&tsc->work,
+                                        msecs_to_jiffies(tsc->poll_period));
                 if (schd)
                         tsc->polling = 1;
                 else {
@@ -303,7 +302,6 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
         tsc->input_dev = input_dev;
 
         INIT_DELAYED_WORK(&tsc->work, tps6507x_ts_handler);
-        tsc->wq = create_workqueue("TPS6507x Touchscreen");
 
         if (init_data) {
                 tsc->poll_period = init_data->poll_period;
@@ -325,8 +323,8 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
         if (error)
                 goto err2;
 
-        schd = queue_delayed_work(tsc->wq, &tsc->work,
-                                  msecs_to_jiffies(tsc->poll_period));
+        schd = schedule_delayed_work(&tsc->work,
+                                     msecs_to_jiffies(tsc->poll_period));
 
         if (schd)
                 tsc->polling = 1;
@@ -335,12 +333,12 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
                 dev_err(tsc->dev, "schedule failed");
                 goto err2;
          }
+        platform_set_drvdata(pdev, tps6507x_dev);
 
         return 0;
 
 err2:
         cancel_delayed_work_sync(&tsc->work);
-        destroy_workqueue(tsc->wq);
         input_free_device(input_dev);
 err1:
         kfree(tsc);
@@ -356,9 +354,8 @@ static int __devexit tps6507x_ts_remove(struct platform_device *pdev)
         struct input_dev *input_dev = tsc->input_dev;
 
         cancel_delayed_work_sync(&tsc->work);
-        destroy_workqueue(tsc->wq);
 
-        input_free_device(input_dev);
+        input_unregister_device(input_dev);
 
         tps6507x_dev->ts = NULL;
         kfree(tsc);
diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
new file mode 100644
index 000000000000..cbf0ff322676
--- /dev/null
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -0,0 +1,764 @@
+/*
+ * TSC2005 touchscreen driver
+ *
+ * Copyright (C) 2006-2010 Nokia Corporation
+ *
+ * Author: Lauri Leukkunen <lauri.leukkunen@nokia.com>
+ * based on TSC2301 driver by Klaus K. Pedersen <klaus.k.pedersen@nokia.com>
+ *
+ * This program 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/tsc2005.h>
+
+/*
+ * The touchscreen interface operates as follows:
+ *
+ * 1) Pen is pressed against the touchscreen.
+ * 2) TSC2005 performs AD conversion.
+ * 3) After the conversion is done TSC2005 drives DAV line down.
+ * 4) GPIO IRQ is received and tsc2005_irq_thread() is scheduled.
+ * 5) tsc2005_irq_thread() queues up an spi transfer to fetch the x, y, z1, z2
+ *    values.
+ * 6) tsc2005_irq_thread() reports coordinates to input layer and sets up
+ *    tsc2005_penup_timer() to be called after TSC2005_PENUP_TIME_MS (40ms).
+ * 7) When the penup timer expires, there have not been touch or DAV interrupts
+ *    during the last 40ms which means the pen has been lifted.
+ *
+ * ESD recovery via a hardware reset is done if the TSC2005 doesn't respond
+ * after a configurable period (in ms) of activity. If esd_timeout is 0, the
+ * watchdog is disabled.
+ */
+
+/* control byte 1 */
+#define TSC2005_CMD                     0x80
+#define TSC2005_CMD_NORMAL              0x00
+#define TSC2005_CMD_STOP                0x01
+#define TSC2005_CMD_12BIT               0x04
+
+/* control byte 0 */
+#define TSC2005_REG_READ                0x0001
+#define TSC2005_REG_PND0                0x0002
+#define TSC2005_REG_X                   0x0000
+#define TSC2005_REG_Y                   0x0008
+#define TSC2005_REG_Z1                  0x0010
+#define TSC2005_REG_Z2                  0x0018
+#define TSC2005_REG_TEMP_HIGH           0x0050
+#define TSC2005_REG_CFR0                0x0060
+#define TSC2005_REG_CFR1                0x0068
+#define TSC2005_REG_CFR2                0x0070
+
+/* configuration register 0 */
+#define TSC2005_CFR0_PRECHARGE_276US    0x0040
+#define TSC2005_CFR0_STABTIME_1MS       0x0300
+#define TSC2005_CFR0_CLOCK_1MHZ         0x1000
+#define TSC2005_CFR0_RESOLUTION12       0x2000
+#define TSC2005_CFR0_PENMODE            0x8000
+#define TSC2005_CFR0_INITVALUE          (TSC2005_CFR0_STABTIME_1MS    | \
+                                         TSC2005_CFR0_CLOCK_1MHZ      | \
+                                         TSC2005_CFR0_RESOLUTION12    | \
+                                         TSC2005_CFR0_PRECHARGE_276US | \
+                                         TSC2005_CFR0_PENMODE)
+
+/* bits common to both read and write of configuration register 0 */
+#define TSC2005_CFR0_RW_MASK            0x3fff
+
+/* configuration register 1 */
+#define TSC2005_CFR1_BATCHDELAY_4MS     0x0003
+#define TSC2005_CFR1_INITVALUE          TSC2005_CFR1_BATCHDELAY_4MS
+
+/* configuration register 2 */
+#define TSC2005_CFR2_MAVE_Z             0x0004
+#define TSC2005_CFR2_MAVE_Y             0x0008
+#define TSC2005_CFR2_MAVE_X             0x0010
+#define TSC2005_CFR2_AVG_7              0x0800
+#define TSC2005_CFR2_MEDIUM_15          0x3000
+#define TSC2005_CFR2_INITVALUE          (TSC2005_CFR2_MAVE_X    | \
+                                         TSC2005_CFR2_MAVE_Y    | \
+                                         TSC2005_CFR2_MAVE_Z    | \
+                                         TSC2005_CFR2_MEDIUM_15 | \
+                                         TSC2005_CFR2_AVG_7)
+
+#define MAX_12BIT                       0xfff
+#define TSC2005_SPI_MAX_SPEED_HZ        10000000
+#define TSC2005_PENUP_TIME_MS           40
+
+struct tsc2005_spi_rd {
+        struct spi_transfer     spi_xfer;
+        u32                     spi_tx;
+        u32                     spi_rx;
+};
+
+struct tsc2005 {
+        struct spi_device       *spi;
+
+        struct spi_message      spi_read_msg;
+        struct tsc2005_spi_rd   spi_x;
+        struct tsc2005_spi_rd   spi_y;
+        struct tsc2005_spi_rd   spi_z1;
+        struct tsc2005_spi_rd   spi_z2;
+
+        struct input_dev        *idev;
+        char                    phys[32];
+
+        struct mutex            mutex;
+
+        /* raw copy of previous x,y,z */
+        int                     in_x;
+        int                     in_y;
+        int                     in_z1;
+        int                     in_z2;
+
+        spinlock_t              lock;
+        struct timer_list       penup_timer;
+
+        unsigned int            esd_timeout;
+        struct delayed_work     esd_work;
+        unsigned long           last_valid_interrupt;
+
+        unsigned int            x_plate_ohm;
+
+        bool                    opened;
+        bool                    suspended;
+
+        bool                    pen_down;
+
+        void                    (*set_reset)(bool enable);
+};
+
+static int tsc2005_cmd(struct tsc2005 *ts, u8 cmd)
+{
+        u8 tx = TSC2005_CMD | TSC2005_CMD_12BIT | cmd;
+        struct spi_transfer xfer = {
+                .tx_buf         = &tx,
+                .len            = 1,
+                .bits_per_word  = 8,
+        };
+        struct spi_message msg;
+        int error;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+
+        error = spi_sync(ts->spi, &msg);
+        if (error) {
+                dev_err(&ts->spi->dev, "%s: failed, command: %x, error: %d\n",
+                        __func__, cmd, error);
+                return error;
+        }
+
+        return 0;
+}
+
+static int tsc2005_write(struct tsc2005 *ts, u8 reg, u16 value)
+{
+        u32 tx = ((reg | TSC2005_REG_PND0) << 16) | value;
+        struct spi_transfer xfer = {
+                .tx_buf         = &tx,
+                .len            = 4,
+                .bits_per_word  = 24,
+        };
+        struct spi_message msg;
+        int error;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&xfer, &msg);
+
+        error = spi_sync(ts->spi, &msg);
+        if (error) {
+                dev_err(&ts->spi->dev,
+                        "%s: failed, register: %x, value: %x, error: %d\n",
+                        __func__, reg, value, error);
+                return error;
+        }
+
+        return 0;
+}
+
+static void tsc2005_setup_read(struct tsc2005_spi_rd *rd, u8 reg, bool last)
+{
+        memset(rd, 0, sizeof(*rd));
+
+        rd->spi_tx                 = (reg | TSC2005_REG_READ) << 16;
+        rd->spi_xfer.tx_buf        = &rd->spi_tx;
+        rd->spi_xfer.rx_buf        = &rd->spi_rx;
+        rd->spi_xfer.len           = 4;
+        rd->spi_xfer.bits_per_word = 24;
+        rd->spi_xfer.cs_change     = !last;
+}
+
+static int tsc2005_read(struct tsc2005 *ts, u8 reg, u16 *value)
+{
+        struct tsc2005_spi_rd spi_rd;
+        struct spi_message msg;
+        int error;
+
+        tsc2005_setup_read(&spi_rd, reg, true);
+
+        spi_message_init(&msg);
+        spi_message_add_tail(&spi_rd.spi_xfer, &msg);
+
+        error = spi_sync(ts->spi, &msg);
+        if (error)
+                return error;
+
+        *value = spi_rd.spi_rx;
+        return 0;
+}
+
+static void tsc2005_update_pen_state(struct tsc2005 *ts,
+                                     int x, int y, int pressure)
+{
+        if (pressure) {
+                input_report_abs(ts->idev, ABS_X, x);
+                input_report_abs(ts->idev, ABS_Y, y);
+                input_report_abs(ts->idev, ABS_PRESSURE, pressure);
+                if (!ts->pen_down) {
+                        input_report_key(ts->idev, BTN_TOUCH, !!pressure);
+                        ts->pen_down = true;
+                }
+        } else {
+                input_report_abs(ts->idev, ABS_PRESSURE, 0);
+                if (ts->pen_down) {
+                        input_report_key(ts->idev, BTN_TOUCH, 0);
+                        ts->pen_down = false;
+                }
+        }
+        input_sync(ts->idev);
+        dev_dbg(&ts->spi->dev, "point(%4d,%4d), pressure (%4d)\n", x, y,
+                pressure);
+}
+
+static irqreturn_t tsc2005_irq_thread(int irq, void *_ts)
+{
+        struct tsc2005 *ts = _ts;
+        unsigned long flags;
+        unsigned int pressure;
+        u32 x, y;
+        u32 z1, z2;
+        int error;
+
+        /* read the coordinates */
+        error = spi_sync(ts->spi, &ts->spi_read_msg);
+        if (unlikely(error))
+                goto out;
+
+        x = ts->spi_x.spi_rx;
+        y = ts->spi_y.spi_rx;
+        z1 = ts->spi_z1.spi_rx;
+        z2 = ts->spi_z2.spi_rx;
+
+        /* validate position */
+        if (unlikely(x > MAX_12BIT || y > MAX_12BIT))
+                goto out;
+
+        /* Skip reading if the pressure components are out of range */
+        if (unlikely(z1 == 0 || z2 > MAX_12BIT || z1 >= z2))
+                goto out;
+
+       /*
+        * Skip point if this is a pen down with the exact same values as
+        * the value before pen-up - that implies SPI fed us stale data
+        */
+        if (!ts->pen_down &&
+            ts->in_x == x && ts->in_y == y &&
+            ts->in_z1 == z1 && ts->in_z2 == z2) {
+                goto out;
+        }
+
+        /*
+         * At this point we are happy we have a valid and useful reading.
+         * Remember it for later comparisons. We may now begin downsampling.
+         */
+        ts->in_x = x;
+        ts->in_y = y;
+        ts->in_z1 = z1;
+        ts->in_z2 = z2;
+
+        /* Compute touch pressure resistance using equation #1 */
+        pressure = x * (z2 - z1) / z1;
+        pressure = pressure * ts->x_plate_ohm / 4096;
+        if (unlikely(pressure > MAX_12BIT))
+                goto out;
+
+        spin_lock_irqsave(&ts->lock, flags);
+
+        tsc2005_update_pen_state(ts, x, y, pressure);
+        mod_timer(&ts->penup_timer,
+                  jiffies + msecs_to_jiffies(TSC2005_PENUP_TIME_MS));
+
+        spin_unlock_irqrestore(&ts->lock, flags);
+
+        ts->last_valid_interrupt = jiffies;
+out:
+        return IRQ_HANDLED;
+}
+
+static void tsc2005_penup_timer(unsigned long data)
+{
+        struct tsc2005 *ts = (struct tsc2005 *)data;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ts->lock, flags);
+        tsc2005_update_pen_state(ts, 0, 0, 0);
+        spin_unlock_irqrestore(&ts->lock, flags);
+}
+
+static void tsc2005_start_scan(struct tsc2005 *ts)
+{
+        tsc2005_write(ts, TSC2005_REG_CFR0, TSC2005_CFR0_INITVALUE);
+        tsc2005_write(ts, TSC2005_REG_CFR1, TSC2005_CFR1_INITVALUE);
+        tsc2005_write(ts, TSC2005_REG_CFR2, TSC2005_CFR2_INITVALUE);
+        tsc2005_cmd(ts, TSC2005_CMD_NORMAL);
+}
+
+static void tsc2005_stop_scan(struct tsc2005 *ts)
+{
+        tsc2005_cmd(ts, TSC2005_CMD_STOP);
+}
+
+/* must be called with ts->mutex held */
+static void __tsc2005_disable(struct tsc2005 *ts)
+{
+        tsc2005_stop_scan(ts);
+
+        disable_irq(ts->spi->irq);
+        del_timer_sync(&ts->penup_timer);
+
+        cancel_delayed_work_sync(&ts->esd_work);
+
+        enable_irq(ts->spi->irq);
+}
+
+/* must be called with ts->mutex held */
+static void __tsc2005_enable(struct tsc2005 *ts)
+{
+        tsc2005_start_scan(ts);
+
+        if (ts->esd_timeout && ts->set_reset) {
+                ts->last_valid_interrupt = jiffies;
+                schedule_delayed_work(&ts->esd_work,
+                                round_jiffies_relative(
+                                        msecs_to_jiffies(ts->esd_timeout)));
+        }
+
+}
+
+static ssize_t tsc2005_selftest_show(struct device *dev,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        struct tsc2005 *ts = spi_get_drvdata(spi);
+        u16 temp_high;
+        u16 temp_high_orig;
+        u16 temp_high_test;
+        bool success = true;
+        int error;
+
+        mutex_lock(&ts->mutex);
+
+        /*
+         * Test TSC2005 communications via temp high register.
+         */
+        __tsc2005_disable(ts);
+
+        error = tsc2005_read(ts, TSC2005_REG_TEMP_HIGH, &temp_high_orig);
+        if (error) {
+                dev_warn(dev, "selftest failed: read error %d\n", error);
+                success = false;
+                goto out;
+        }
+
+        temp_high_test = (temp_high_orig - 1) & MAX_12BIT;
+
+        error = tsc2005_write(ts, TSC2005_REG_TEMP_HIGH, temp_high_test);
+        if (error) {
+                dev_warn(dev, "selftest failed: write error %d\n", error);
+                success = false;
+                goto out;
+        }
+
+        error = tsc2005_read(ts, TSC2005_REG_TEMP_HIGH, &temp_high);
+        if (error) {
+                dev_warn(dev, "selftest failed: read error %d after write\n",
+                         error);
+                success = false;
+                goto out;
+        }
+
+        if (temp_high != temp_high_test) {
+                dev_warn(dev, "selftest failed: %d != %d\n",
+                         temp_high, temp_high_test);
+                success = false;
+        }
+
+        /* hardware reset */
+        ts->set_reset(false);
+        usleep_range(100, 500); /* only 10us required */
+        ts->set_reset(true);
+
+        if (!success)
+                goto out;
+
+        /* test that the reset really happened */
+        error = tsc2005_read(ts, TSC2005_REG_TEMP_HIGH, &temp_high);
+        if (error) {
+                dev_warn(dev, "selftest failed: read error %d after reset\n",
+                         error);
+                success = false;
+                goto out;
+        }
+
+        if (temp_high != temp_high_orig) {
+                dev_warn(dev, "selftest failed after reset: %d != %d\n",
+                         temp_high, temp_high_orig);
+                success = false;
+        }
+
+out:
+        __tsc2005_enable(ts);
+        mutex_unlock(&ts->mutex);
+
+        return sprintf(buf, "%d\n", success);
+}
+
+static DEVICE_ATTR(selftest, S_IRUGO, tsc2005_selftest_show, NULL);
+
+static struct attribute *tsc2005_attrs[] = {
+        &dev_attr_selftest.attr,
+        NULL
+};
+
+static mode_t tsc2005_attr_is_visible(struct kobject *kobj,
+                                      struct attribute *attr, int n)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct spi_device *spi = to_spi_device(dev);
+        struct tsc2005 *ts = spi_get_drvdata(spi);
+        mode_t mode = attr->mode;
+
+        if (attr == &dev_attr_selftest.attr) {
+                if (!ts->set_reset)
+                        mode = 0;
+        }
+
+        return mode;
+}
+
+static const struct attribute_group tsc2005_attr_group = {
+        .is_visible     = tsc2005_attr_is_visible,
+        .attrs          = tsc2005_attrs,
+};
+
+static void tsc2005_esd_work(struct work_struct *work)
+{
+        struct tsc2005 *ts = container_of(work, struct tsc2005, esd_work.work);
+        int error;
+        u16 r;
+
+        if (!mutex_trylock(&ts->mutex)) {
+                /*
+                 * If the mutex is taken, it means that disable or enable is in
+                 * progress. In that case just reschedule the work. If the work
+                 * is not needed, it will be canceled by disable.
+                 */
+                goto reschedule;
+        }
+
+        if (time_is_after_jiffies(ts->last_valid_interrupt +
+                                  msecs_to_jiffies(ts->esd_timeout)))
+                goto out;
+
+        /* We should be able to read register without disabling interrupts. */
+        error = tsc2005_read(ts, TSC2005_REG_CFR0, &r);
+        if (!error &&
+            !((r ^ TSC2005_CFR0_INITVALUE) & TSC2005_CFR0_RW_MASK)) {
+                goto out;
+        }
+
+        /*
+         * If we could not read our known value from configuration register 0
+         * then we should reset the controller as if from power-up and start
+         * scanning again.
+         */
+        dev_info(&ts->spi->dev, "TSC2005 not responding - resetting\n");
+
+        disable_irq(ts->spi->irq);
+        del_timer_sync(&ts->penup_timer);
+
+        tsc2005_update_pen_state(ts, 0, 0, 0);
+
+        ts->set_reset(false);
+        usleep_range(100, 500); /* only 10us required */
+        ts->set_reset(true);
+
+        enable_irq(ts->spi->irq);
+        tsc2005_start_scan(ts);
+
+out:
+        mutex_unlock(&ts->mutex);
+reschedule:
+        /* re-arm the watchdog */
+        schedule_delayed_work(&ts->esd_work,
+                              round_jiffies_relative(
+                                        msecs_to_jiffies(ts->esd_timeout)));
+}
+
+static int tsc2005_open(struct input_dev *input)
+{
+        struct tsc2005 *ts = input_get_drvdata(input);
+
+        mutex_lock(&ts->mutex);
+
+        if (!ts->suspended)
+                __tsc2005_enable(ts);
+
+        ts->opened = true;
+
+        mutex_unlock(&ts->mutex);
+
+        return 0;
+}
+
+static void tsc2005_close(struct input_dev *input)
+{
+        struct tsc2005 *ts = input_get_drvdata(input);
+
+        mutex_lock(&ts->mutex);
+
+        if (!ts->suspended)
+                __tsc2005_disable(ts);
+
+        ts->opened = false;
+
+        mutex_unlock(&ts->mutex);
+}
+
+static void __devinit tsc2005_setup_spi_xfer(struct tsc2005 *ts)
+{
+        tsc2005_setup_read(&ts->spi_x, TSC2005_REG_X, false);
+        tsc2005_setup_read(&ts->spi_y, TSC2005_REG_Y, false);
+        tsc2005_setup_read(&ts->spi_z1, TSC2005_REG_Z1, false);
+        tsc2005_setup_read(&ts->spi_z2, TSC2005_REG_Z2, true);
+
+        spi_message_init(&ts->spi_read_msg);
+        spi_message_add_tail(&ts->spi_x.spi_xfer, &ts->spi_read_msg);
+        spi_message_add_tail(&ts->spi_y.spi_xfer, &ts->spi_read_msg);
+        spi_message_add_tail(&ts->spi_z1.spi_xfer, &ts->spi_read_msg);
+        spi_message_add_tail(&ts->spi_z2.spi_xfer, &ts->spi_read_msg);
+}
+
+static int __devinit tsc2005_probe(struct spi_device *spi)
+{
+        const struct tsc2005_platform_data *pdata = spi->dev.platform_data;
+        struct tsc2005 *ts;
+        struct input_dev *input_dev;
+        unsigned int max_x, max_y, max_p;
+        unsigned int fudge_x, fudge_y, fudge_p;
+        int error;
+
+        if (!pdata) {
+                dev_dbg(&spi->dev, "no platform data\n");
+                return -ENODEV;
+        }
+
+        fudge_x = pdata->ts_x_fudge        ? : 4;
+        fudge_y = pdata->ts_y_fudge        ? : 8;
+        fudge_p = pdata->ts_pressure_fudge ? : 2;
+        max_x   = pdata->ts_x_max          ? : MAX_12BIT;
+        max_y   = pdata->ts_y_max          ? : MAX_12BIT;
+        max_p   = pdata->ts_pressure_max   ? : MAX_12BIT;
+
+        if (spi->irq <= 0) {
+                dev_dbg(&spi->dev, "no irq\n");
+                return -ENODEV;
+        }
+
+        spi->mode = SPI_MODE_0;
+        spi->bits_per_word = 8;
+        if (!spi->max_speed_hz)
+                spi->max_speed_hz = TSC2005_SPI_MAX_SPEED_HZ;
+
+        error = spi_setup(spi);
+        if (error)
+                return error;
+
+        ts = kzalloc(sizeof(*ts), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!ts || !input_dev) {
+                error = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        ts->spi = spi;
+        ts->idev = input_dev;
+
+        ts->x_plate_ohm = pdata->ts_x_plate_ohm ? : 280;
+        ts->esd_timeout = pdata->esd_timeout_ms;
+        ts->set_reset   = pdata->set_reset;
+
+        mutex_init(&ts->mutex);
+
+        spin_lock_init(&ts->lock);
+        setup_timer(&ts->penup_timer, tsc2005_penup_timer, (unsigned long)ts);
+
+        INIT_DELAYED_WORK(&ts->esd_work, tsc2005_esd_work);
+
+        tsc2005_setup_spi_xfer(ts);
+
+        snprintf(ts->phys, sizeof(ts->phys),
+                 "%s/input-ts", dev_name(&spi->dev));
+
+        input_dev->name = "TSC2005 touchscreen";
+        input_dev->phys = ts->phys;
+        input_dev->id.bustype = BUS_SPI;
+        input_dev->dev.parent = &spi->dev;
+        input_dev->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+
+        input_set_abs_params(input_dev, ABS_X, 0, max_x, fudge_x, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, max_y, fudge_y, 0);
+        input_set_abs_params(input_dev, ABS_PRESSURE, 0, max_p, fudge_p, 0);
+
+        input_dev->open = tsc2005_open;
+        input_dev->close = tsc2005_close;
+
+        input_set_drvdata(input_dev, ts);
+
+        /* Ensure the touchscreen is off */
+        tsc2005_stop_scan(ts);
+
+        error = request_threaded_irq(spi->irq, NULL, tsc2005_irq_thread,
+                                     IRQF_TRIGGER_RISING, "tsc2005", ts);
+        if (error) {
+                dev_err(&spi->dev, "Failed to request irq, err: %d\n", error);
+                goto err_free_mem;
+        }
+
+        spi_set_drvdata(spi, ts);
+        error = sysfs_create_group(&spi->dev.kobj, &tsc2005_attr_group);
+        if (error) {
+                dev_err(&spi->dev,
+                        "Failed to create sysfs attributes, err: %d\n", error);
+                goto err_clear_drvdata;
+        }
+
+        error = input_register_device(ts->idev);
+        if (error) {
+                dev_err(&spi->dev,
+                        "Failed to register input device, err: %d\n", error);
+                goto err_remove_sysfs;
+        }
+
+        irq_set_irq_wake(spi->irq, 1);
+        return 0;
+
+err_remove_sysfs:
+        sysfs_remove_group(&spi->dev.kobj, &tsc2005_attr_group);
+err_clear_drvdata:
+        spi_set_drvdata(spi, NULL);
+        free_irq(spi->irq, ts);
+err_free_mem:
+        input_free_device(input_dev);
+        kfree(ts);
+        return error;
+}
+
+static int __devexit tsc2005_remove(struct spi_device *spi)
+{
+        struct tsc2005 *ts = spi_get_drvdata(spi);
+
+        sysfs_remove_group(&ts->spi->dev.kobj, &tsc2005_attr_group);
+
+        free_irq(ts->spi->irq, ts);
+        input_unregister_device(ts->idev);
+        kfree(ts);
+
+        spi_set_drvdata(spi, NULL);
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int tsc2005_suspend(struct device *dev)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        struct tsc2005 *ts = spi_get_drvdata(spi);
+
+        mutex_lock(&ts->mutex);
+
+        if (!ts->suspended && ts->opened)
+                __tsc2005_disable(ts);
+
+        ts->suspended = true;
+
+        mutex_unlock(&ts->mutex);
+
+        return 0;
+}
+
+static int tsc2005_resume(struct device *dev)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        struct tsc2005 *ts = spi_get_drvdata(spi);
+
+        mutex_lock(&ts->mutex);
+
+        if (ts->suspended && ts->opened)
+                __tsc2005_enable(ts);
+
+        ts->suspended = false;
+
+        mutex_unlock(&ts->mutex);
+
+        return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(tsc2005_pm_ops, tsc2005_suspend, tsc2005_resume);
+
+static struct spi_driver tsc2005_driver = {
+        .driver = {
+                .name   = "tsc2005",
+                .owner  = THIS_MODULE,
+                .pm     = &tsc2005_pm_ops,
+        },
+        .probe  = tsc2005_probe,
+        .remove = __devexit_p(tsc2005_remove),
+};
+
+static int __init tsc2005_init(void)
+{
+        return spi_register_driver(&tsc2005_driver);
+}
+module_init(tsc2005_init);
+
+static void __exit tsc2005_exit(void)
+{
+        spi_unregister_driver(&tsc2005_driver);
+}
+module_exit(tsc2005_exit);
+
+MODULE_AUTHOR("Lauri Leukkunen <lauri.leukkunen@nokia.com>");
+MODULE_DESCRIPTION("TSC2005 Touchscreen Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c
index be23780e8a3e..fadc11545b1e 100644
--- a/drivers/input/touchscreen/tsc2007.c
+++ b/drivers/input/touchscreen/tsc2007.c
@@ -27,9 +27,6 @@
 #include <linux/i2c.h>
 #include <linux/i2c/tsc2007.h>
 
-#define TS_POLL_DELAY                   1 /* ms delay between samples */
-#define TS_POLL_PERIOD                  1 /* ms delay between samples */
-
 #define TSC2007_MEASURE_TEMP0           (0x0 << 4)
 #define TSC2007_MEASURE_AUX             (0x2 << 4)
 #define TSC2007_MEASURE_TEMP1           (0x4 << 4)
@@ -75,6 +72,9 @@ struct tsc2007 {
 
         u16                     model;
         u16                     x_plate_ohms;
+        u16                     max_rt;
+        unsigned long           poll_delay;
+        unsigned long           poll_period;
 
         bool                    pendown;
         int                     irq;
@@ -156,6 +156,7 @@ static void tsc2007_work(struct work_struct *work)
 {
         struct tsc2007 *ts =
                 container_of(to_delayed_work(work), struct tsc2007, work);
+        bool debounced = false;
         struct ts_event tc;
         u32 rt;
 
@@ -184,13 +185,14 @@ static void tsc2007_work(struct work_struct *work)
         tsc2007_read_values(ts, &tc);
 
         rt = tsc2007_calculate_pressure(ts, &tc);
-        if (rt > MAX_12BIT) {
+        if (rt > ts->max_rt) {
                 /*
                  * Sample found inconsistent by debouncing or pressure is
                  * beyond the maximum. Don't report it to user space,
                  * repeat at least once more the measurement.
                  */
                 dev_dbg(&ts->client->dev, "ignored pressure %d\n", rt);
+                debounced = true;
                 goto out;
 
         }
@@ -225,9 +227,9 @@ static void tsc2007_work(struct work_struct *work)
         }
 
  out:
-        if (ts->pendown)
+        if (ts->pendown || debounced)
                 schedule_delayed_work(&ts->work,
-                                      msecs_to_jiffies(TS_POLL_PERIOD));
+                                      msecs_to_jiffies(ts->poll_period));
         else
                 enable_irq(ts->irq);
 }
@@ -239,7 +241,7 @@ static irqreturn_t tsc2007_irq(int irq, void *handle)
         if (!ts->get_pendown_state || likely(ts->get_pendown_state())) {
                 disable_irq_nosync(ts->irq);
                 schedule_delayed_work(&ts->work,
-                                      msecs_to_jiffies(TS_POLL_DELAY));
+                                      msecs_to_jiffies(ts->poll_delay));
         }
 
         if (ts->clear_penirq)
@@ -265,7 +267,7 @@ static int __devinit tsc2007_probe(struct i2c_client *client,
                                    const struct i2c_device_id *id)
 {
         struct tsc2007 *ts;
-        struct tsc2007_platform_data *pdata = pdata = client->dev.platform_data;
+        struct tsc2007_platform_data *pdata = client->dev.platform_data;
         struct input_dev *input_dev;
         int err;
 
@@ -292,6 +294,9 @@ static int __devinit tsc2007_probe(struct i2c_client *client,
 
         ts->model             = pdata->model;
         ts->x_plate_ohms      = pdata->x_plate_ohms;
+        ts->max_rt            = pdata->max_rt ? : MAX_12BIT;
+        ts->poll_delay        = pdata->poll_delay ? : 1;
+        ts->poll_period       = pdata->poll_period ? : 1;
         ts->get_pendown_state = pdata->get_pendown_state;
         ts->clear_penirq      = pdata->clear_penirq;
 
@@ -305,9 +310,10 @@ static int __devinit tsc2007_probe(struct i2c_client *client,
         input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
         input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
 
-        input_set_abs_params(input_dev, ABS_X, 0, MAX_12BIT, 0, 0);
-        input_set_abs_params(input_dev, ABS_Y, 0, MAX_12BIT, 0, 0);
-        input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_12BIT, 0, 0);
+        input_set_abs_params(input_dev, ABS_X, 0, MAX_12BIT, pdata->fuzzx, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, MAX_12BIT, pdata->fuzzy, 0);
+        input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_12BIT,
+                        pdata->fuzzz, 0);
 
         if (pdata->init_platform_hw)
                 pdata->init_platform_hw();
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index 028a5363eea1..3b5b5df04dd6 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -6,7 +6,7 @@
  *  Copyright:  MontaVista Software, Inc.
  *
  * Spliting done by: Marek Vasut <marek.vasut@gmail.com>
- * If something doesnt work and it worked before spliting, e-mail me,
+ * If something doesn't work and it worked before spliting, e-mail me,
  * dont bother Nicolas please ;-)
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index f45f80f6d336..73fd6642b681 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -178,6 +178,7 @@ static const struct usb_device_id usbtouch_devices[] = {
 
 #ifdef CONFIG_TOUCHSCREEN_USB_ITM
         {USB_DEVICE(0x0403, 0xf9e9), .driver_info = DEVTYPE_ITM},
+        {USB_DEVICE(0x16e3, 0xf9e9), .driver_info = DEVTYPE_ITM},
 #endif
 
 #ifdef CONFIG_TOUCHSCREEN_USB_ETURBO
diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index 56dc35c94bb1..c14412ef4648 100644
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -2,6 +2,8 @@
  * Wacom W8001 penabled serial touchscreen driver
  *
  * Copyright (c) 2008 Jaya Kumar
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2010 - 2011 Ping Cheng, Wacom. <pingc@wacom.com>
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of this archive for
@@ -14,10 +16,11 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/input.h>
+#include <linux/input/mt.h>
 #include <linux/serio.h>
 #include <linux/init.h>
 #include <linux/ctype.h>
+#include <linux/delay.h>
 
 #define DRIVER_DESC     "Wacom W8001 serial touchscreen driver"
 
@@ -30,11 +33,27 @@ MODULE_LICENSE("GPL");
 #define W8001_LEAD_BYTE         0x80
 #define W8001_TAB_MASK          0x40
 #define W8001_TAB_BYTE          0x40
+/* set in first byte of touch data packets */
+#define W8001_TOUCH_MASK        (0x10 | W8001_LEAD_MASK)
+#define W8001_TOUCH_BYTE        (0x10 | W8001_LEAD_BYTE)
 
 #define W8001_QUERY_PACKET      0x20
 
+#define W8001_CMD_STOP          '0'
 #define W8001_CMD_START         '1'
 #define W8001_CMD_QUERY         '*'
+#define W8001_CMD_TOUCHQUERY    '%'
+
+/* length of data packets in bytes, depends on device. */
+#define W8001_PKTLEN_TOUCH93    5
+#define W8001_PKTLEN_TOUCH9A    7
+#define W8001_PKTLEN_TPCPEN     9
+#define W8001_PKTLEN_TPCCTL     11      /* control packet */
+#define W8001_PKTLEN_TOUCH2FG   13
+
+/* resolution in points/mm */
+#define W8001_PEN_RESOLUTION    100
+#define W8001_TOUCH_RESOLUTION  10
 
 struct w8001_coord {
         u8 rdy;
@@ -48,6 +67,15 @@ struct w8001_coord {
         u8 tilt_y;
 };
 
+/* touch query reply packet */
+struct w8001_touch_query {
+        u16 x;
+        u16 y;
+        u8 panel_res;
+        u8 capacity_res;
+        u8 sensor_id;
+};
+
 /*
  * Per-touchscreen data.
  */
@@ -62,9 +90,16 @@ struct w8001 {
         unsigned char response[W8001_MAX_LENGTH];
         unsigned char data[W8001_MAX_LENGTH];
         char phys[32];
+        int type;
+        unsigned int pktlen;
+        u16 max_touch_x;
+        u16 max_touch_y;
+        u16 max_pen_x;
+        u16 max_pen_y;
+        char name[64];
 };
 
-static void parse_data(u8 *data, struct w8001_coord *coord)
+static void parse_pen_data(u8 *data, struct w8001_coord *coord)
 {
         memset(coord, 0, sizeof(*coord));
 
@@ -88,11 +123,166 @@ static void parse_data(u8 *data, struct w8001_coord *coord)
         coord->tilt_y = data[8] & 0x7F;
 }
 
+static void parse_single_touch(u8 *data, struct w8001_coord *coord)
+{
+        coord->x = (data[1] << 7) | data[2];
+        coord->y = (data[3] << 7) | data[4];
+        coord->tsw = data[0] & 0x01;
+}
+
+static void scale_touch_coordinates(struct w8001 *w8001,
+                                    unsigned int *x, unsigned int *y)
+{
+        if (w8001->max_pen_x && w8001->max_touch_x)
+                *x = *x * w8001->max_pen_x / w8001->max_touch_x;
+
+        if (w8001->max_pen_y && w8001->max_touch_y)
+                *y = *y * w8001->max_pen_y / w8001->max_touch_y;
+}
+
+static void parse_multi_touch(struct w8001 *w8001)
+{
+        struct input_dev *dev = w8001->dev;
+        unsigned char *data = w8001->data;
+        unsigned int x, y;
+        int i;
+        int count = 0;
+
+        for (i = 0; i < 2; i++) {
+                bool touch = data[0] & (1 << i);
+
+                input_mt_slot(dev, i);
+                input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
+                if (touch) {
+                        x = (data[6 * i + 1] << 7) | data[6 * i + 2];
+                        y = (data[6 * i + 3] << 7) | data[6 * i + 4];
+                        /* data[5,6] and [11,12] is finger capacity */
+
+                        /* scale to pen maximum */
+                        scale_touch_coordinates(w8001, &x, &y);
+
+                        input_report_abs(dev, ABS_MT_POSITION_X, x);
+                        input_report_abs(dev, ABS_MT_POSITION_Y, y);
+                        count++;
+                }
+        }
+
+        /* emulate single touch events when stylus is out of proximity.
+         * This is to make single touch backward support consistent
+         * across all Wacom single touch devices.
+         */
+        if (w8001->type != BTN_TOOL_PEN &&
+                            w8001->type != BTN_TOOL_RUBBER) {
+                w8001->type = count == 1 ? BTN_TOOL_FINGER : KEY_RESERVED;
+                input_mt_report_pointer_emulation(dev, true);
+        }
+
+        input_sync(dev);
+}
+
+static void parse_touchquery(u8 *data, struct w8001_touch_query *query)
+{
+        memset(query, 0, sizeof(*query));
+
+        query->panel_res = data[1];
+        query->sensor_id = data[2] & 0x7;
+        query->capacity_res = data[7];
+
+        query->x = data[3] << 9;
+        query->x |= data[4] << 2;
+        query->x |= (data[2] >> 5) & 0x3;
+
+        query->y = data[5] << 9;
+        query->y |= data[6] << 2;
+        query->y |= (data[2] >> 3) & 0x3;
+
+        /* Early days' single-finger touch models need the following defaults */
+        if (!query->x && !query->y) {
+                query->x = 1024;
+                query->y = 1024;
+                if (query->panel_res)
+                        query->x = query->y = (1 << query->panel_res);
+                query->panel_res = W8001_TOUCH_RESOLUTION;
+        }
+}
+
+static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
+{
+        struct input_dev *dev = w8001->dev;
+
+        /*
+         * We have 1 bit for proximity (rdy) and 3 bits for tip, side,
+         * side2/eraser. If rdy && f2 are set, this can be either pen + side2,
+         * or eraser. Assume:
+         * - if dev is already in proximity and f2 is toggled → pen + side2
+         * - if dev comes into proximity with f2 set → eraser
+         * If f2 disappears after assuming eraser, fake proximity out for
+         * eraser and in for pen.
+         */
+
+        switch (w8001->type) {
+        case BTN_TOOL_RUBBER:
+                if (!coord->f2) {
+                        input_report_abs(dev, ABS_PRESSURE, 0);
+                        input_report_key(dev, BTN_TOUCH, 0);
+                        input_report_key(dev, BTN_STYLUS, 0);
+                        input_report_key(dev, BTN_STYLUS2, 0);
+                        input_report_key(dev, BTN_TOOL_RUBBER, 0);
+                        input_sync(dev);
+                        w8001->type = BTN_TOOL_PEN;
+                }
+                break;
+
+        case BTN_TOOL_FINGER:
+                input_report_key(dev, BTN_TOUCH, 0);
+                input_report_key(dev, BTN_TOOL_FINGER, 0);
+                input_sync(dev);
+                /* fall through */
+
+        case KEY_RESERVED:
+                w8001->type = coord->f2 ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
+                break;
+
+        default:
+                input_report_key(dev, BTN_STYLUS2, coord->f2);
+                break;
+        }
+
+        input_report_abs(dev, ABS_X, coord->x);
+        input_report_abs(dev, ABS_Y, coord->y);
+        input_report_abs(dev, ABS_PRESSURE, coord->pen_pressure);
+        input_report_key(dev, BTN_TOUCH, coord->tsw);
+        input_report_key(dev, BTN_STYLUS, coord->f1);
+        input_report_key(dev, w8001->type, coord->rdy);
+        input_sync(dev);
+
+        if (!coord->rdy)
+                w8001->type = KEY_RESERVED;
+}
+
+static void report_single_touch(struct w8001 *w8001, struct w8001_coord *coord)
+{
+        struct input_dev *dev = w8001->dev;
+        unsigned int x = coord->x;
+        unsigned int y = coord->y;
+
+        /* scale to pen maximum */
+        scale_touch_coordinates(w8001, &x, &y);
+
+        input_report_abs(dev, ABS_X, x);
+        input_report_abs(dev, ABS_Y, y);
+        input_report_key(dev, BTN_TOUCH, coord->tsw);
+        input_report_key(dev, BTN_TOOL_FINGER, coord->tsw);
+
+        input_sync(dev);
+
+        w8001->type = coord->tsw ? BTN_TOOL_FINGER : KEY_RESERVED;
+}
+
 static irqreturn_t w8001_interrupt(struct serio *serio,
                                    unsigned char data, unsigned int flags)
 {
         struct w8001 *w8001 = serio_get_drvdata(serio);
-        struct input_dev *dev = w8001->dev;
         struct w8001_coord coord;
         unsigned char tmp;
 
@@ -105,26 +295,54 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
                 }
                 break;
 
-        case 8:
+        case W8001_PKTLEN_TOUCH93 - 1:
+        case W8001_PKTLEN_TOUCH9A - 1:
+                tmp = w8001->data[0] & W8001_TOUCH_BYTE;
+                if (tmp != W8001_TOUCH_BYTE)
+                        break;
+
+                if (w8001->pktlen == w8001->idx) {
+                        w8001->idx = 0;
+                        if (w8001->type != BTN_TOOL_PEN &&
+                            w8001->type != BTN_TOOL_RUBBER) {
+                                parse_single_touch(w8001->data, &coord);
+                                report_single_touch(w8001, &coord);
+                        }
+                }
+                break;
+
+        /* Pen coordinates packet */
+        case W8001_PKTLEN_TPCPEN - 1:
                 tmp = w8001->data[0] & W8001_TAB_MASK;
                 if (unlikely(tmp == W8001_TAB_BYTE))
                         break;
 
+                tmp = w8001->data[0] & W8001_TOUCH_BYTE;
+                if (tmp == W8001_TOUCH_BYTE)
+                        break;
+
                 w8001->idx = 0;
-                parse_data(w8001->data, &coord);
-                input_report_abs(dev, ABS_X, coord.x);
-                input_report_abs(dev, ABS_Y, coord.y);
-                input_report_abs(dev, ABS_PRESSURE, coord.pen_pressure);
-                input_report_key(dev, BTN_TOUCH, coord.tsw);
-                input_sync(dev);
+                parse_pen_data(w8001->data, &coord);
+                report_pen_events(w8001, &coord);
                 break;
 
-        case 10:
+        /* control packet */
+        case W8001_PKTLEN_TPCCTL - 1:
+                tmp = w8001->data[0] & W8001_TOUCH_MASK;
+                if (tmp == W8001_TOUCH_BYTE)
+                        break;
+
                 w8001->idx = 0;
                 memcpy(w8001->response, w8001->data, W8001_MAX_LENGTH);
                 w8001->response_type = W8001_QUERY_PACKET;
                 complete(&w8001->cmd_done);
                 break;
+
+        /* 2 finger touch packet */
+        case W8001_PKTLEN_TOUCH2FG - 1:
+                w8001->idx = 0;
+                parse_multi_touch(w8001);
+                break;
         }
 
         return IRQ_HANDLED;
@@ -153,19 +371,108 @@ static int w8001_setup(struct w8001 *w8001)
 {
         struct input_dev *dev = w8001->dev;
         struct w8001_coord coord;
+        struct w8001_touch_query touch;
         int error;
 
-        error = w8001_command(w8001, W8001_CMD_QUERY, true);
+        error = w8001_command(w8001, W8001_CMD_STOP, false);
         if (error)
                 return error;
 
-        parse_data(w8001->response, &coord);
+        msleep(250);    /* wait 250ms before querying the device */
+
+        dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        strlcat(w8001->name, "Wacom Serial", sizeof(w8001->name));
 
-        input_set_abs_params(dev, ABS_X, 0, coord.x, 0, 0);
-        input_set_abs_params(dev, ABS_Y, 0, coord.y, 0, 0);
-        input_set_abs_params(dev, ABS_PRESSURE, 0, coord.pen_pressure, 0, 0);
-        input_set_abs_params(dev, ABS_TILT_X, 0, coord.tilt_x, 0, 0);
-        input_set_abs_params(dev, ABS_TILT_Y, 0, coord.tilt_y, 0, 0);
+        /* penabled? */
+        error = w8001_command(w8001, W8001_CMD_QUERY, true);
+        if (!error) {
+                __set_bit(BTN_TOUCH, dev->keybit);
+                __set_bit(BTN_TOOL_PEN, dev->keybit);
+                __set_bit(BTN_TOOL_RUBBER, dev->keybit);
+                __set_bit(BTN_STYLUS, dev->keybit);
+                __set_bit(BTN_STYLUS2, dev->keybit);
+
+                parse_pen_data(w8001->response, &coord);
+                w8001->max_pen_x = coord.x;
+                w8001->max_pen_y = coord.y;
+
+                input_set_abs_params(dev, ABS_X, 0, coord.x, 0, 0);
+                input_set_abs_params(dev, ABS_Y, 0, coord.y, 0, 0);
+                input_abs_set_res(dev, ABS_X, W8001_PEN_RESOLUTION);
+                input_abs_set_res(dev, ABS_Y, W8001_PEN_RESOLUTION);
+                input_set_abs_params(dev, ABS_PRESSURE, 0, coord.pen_pressure, 0, 0);
+                if (coord.tilt_x && coord.tilt_y) {
+                        input_set_abs_params(dev, ABS_TILT_X, 0, coord.tilt_x, 0, 0);
+                        input_set_abs_params(dev, ABS_TILT_Y, 0, coord.tilt_y, 0, 0);
+                }
+                w8001->id = 0x90;
+                strlcat(w8001->name, " Penabled", sizeof(w8001->name));
+        }
+
+        /* Touch enabled? */
+        error = w8001_command(w8001, W8001_CMD_TOUCHQUERY, true);
+
+        /*
+         * Some non-touch devices may reply to the touch query. But their
+         * second byte is empty, which indicates touch is not supported.
+         */
+        if (!error && w8001->response[1]) {
+                __set_bit(BTN_TOUCH, dev->keybit);
+                __set_bit(BTN_TOOL_FINGER, dev->keybit);
+
+                parse_touchquery(w8001->response, &touch);
+                w8001->max_touch_x = touch.x;
+                w8001->max_touch_y = touch.y;
+
+                if (w8001->max_pen_x && w8001->max_pen_y) {
+                        /* if pen is supported scale to pen maximum */
+                        touch.x = w8001->max_pen_x;
+                        touch.y = w8001->max_pen_y;
+                        touch.panel_res = W8001_PEN_RESOLUTION;
+                }
+
+                input_set_abs_params(dev, ABS_X, 0, touch.x, 0, 0);
+                input_set_abs_params(dev, ABS_Y, 0, touch.y, 0, 0);
+                input_abs_set_res(dev, ABS_X, touch.panel_res);
+                input_abs_set_res(dev, ABS_Y, touch.panel_res);
+
+                switch (touch.sensor_id) {
+                case 0:
+                case 2:
+                        w8001->pktlen = W8001_PKTLEN_TOUCH93;
+                        w8001->id = 0x93;
+                        strlcat(w8001->name, " 1FG", sizeof(w8001->name));
+                        break;
+
+                case 1:
+                case 3:
+                case 4:
+                        w8001->pktlen = W8001_PKTLEN_TOUCH9A;
+                        strlcat(w8001->name, " 1FG", sizeof(w8001->name));
+                        w8001->id = 0x9a;
+                        break;
+
+                case 5:
+                        w8001->pktlen = W8001_PKTLEN_TOUCH2FG;
+
+                        input_mt_init_slots(dev, 2);
+                        input_set_abs_params(dev, ABS_MT_POSITION_X,
+                                                0, touch.x, 0, 0);
+                        input_set_abs_params(dev, ABS_MT_POSITION_Y,
+                                                0, touch.y, 0, 0);
+                        input_set_abs_params(dev, ABS_MT_TOOL_TYPE,
+                                                0, MT_TOOL_MAX, 0, 0);
+
+                        strlcat(w8001->name, " 2FG", sizeof(w8001->name));
+                        if (w8001->max_pen_x && w8001->max_pen_y)
+                                w8001->id = 0xE3;
+                        else
+                                w8001->id = 0xE2;
+                        break;
+                }
+        }
+
+        strlcat(w8001->name, " Touchscreen", sizeof(w8001->name));
 
         return w8001_command(w8001, W8001_CMD_START, false);
 }
@@ -206,22 +513,10 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
         }
 
         w8001->serio = serio;
-        w8001->id = serio->id.id;
         w8001->dev = input_dev;
         init_completion(&w8001->cmd_done);
         snprintf(w8001->phys, sizeof(w8001->phys), "%s/input0", serio->phys);
 
-        input_dev->name = "Wacom W8001 Penabled Serial TouchScreen";
-        input_dev->phys = w8001->phys;
-        input_dev->id.bustype = BUS_RS232;
-        input_dev->id.vendor = SERIO_W8001;
-        input_dev->id.product = w8001->id;
-        input_dev->id.version = 0x0100;
-        input_dev->dev.parent = &serio->dev;
-
-        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
-
         serio_set_drvdata(serio, w8001);
         err = serio_open(serio, drv);
         if (err)
@@ -231,6 +526,14 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
         if (err)
                 goto fail3;
 
+        input_dev->name = w8001->name;
+        input_dev->phys = w8001->phys;
+        input_dev->id.product = w8001->id;
+        input_dev->id.bustype = BUS_RS232;
+        input_dev->id.vendor = 0x056a;
+        input_dev->id.version = 0x0100;
+        input_dev->dev.parent = &serio->dev;
+
         err = input_register_device(w8001->dev);
         if (err)
                 goto fail3;
diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
new file mode 100644
index 000000000000..9175d49d2546
--- /dev/null
+++ b/drivers/input/touchscreen/wm831x-ts.c
@@ -0,0 +1,421 @@
+/*
+ * Touchscreen driver for WM831x PMICs
+ *
+ * Copyright 2011 Wolfson Microelectronics plc.
+ * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
+ *
+ * This program 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.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/pm.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/mfd/wm831x/core.h>
+#include <linux/mfd/wm831x/irq.h>
+#include <linux/mfd/wm831x/pdata.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+
+/*
+ * R16424 (0x4028) - Touch Control 1
+ */
+#define WM831X_TCH_ENA                          0x8000  /* TCH_ENA */
+#define WM831X_TCH_CVT_ENA                      0x4000  /* TCH_CVT_ENA */
+#define WM831X_TCH_SLPENA                       0x1000  /* TCH_SLPENA */
+#define WM831X_TCH_Z_ENA                        0x0400  /* TCH_Z_ENA */
+#define WM831X_TCH_Y_ENA                        0x0200  /* TCH_Y_ENA */
+#define WM831X_TCH_X_ENA                        0x0100  /* TCH_X_ENA */
+#define WM831X_TCH_DELAY_MASK                   0x00E0  /* TCH_DELAY - [7:5] */
+#define WM831X_TCH_DELAY_SHIFT                       5  /* TCH_DELAY - [7:5] */
+#define WM831X_TCH_DELAY_WIDTH                       3  /* TCH_DELAY - [7:5] */
+#define WM831X_TCH_RATE_MASK                    0x001F  /* TCH_RATE - [4:0] */
+#define WM831X_TCH_RATE_SHIFT                        0  /* TCH_RATE - [4:0] */
+#define WM831X_TCH_RATE_WIDTH                        5  /* TCH_RATE - [4:0] */
+
+/*
+ * R16425 (0x4029) - Touch Control 2
+ */
+#define WM831X_TCH_PD_WK                        0x2000  /* TCH_PD_WK */
+#define WM831X_TCH_5WIRE                        0x1000  /* TCH_5WIRE */
+#define WM831X_TCH_PDONLY                       0x0800  /* TCH_PDONLY */
+#define WM831X_TCH_ISEL                         0x0100  /* TCH_ISEL */
+#define WM831X_TCH_RPU_MASK                     0x000F  /* TCH_RPU - [3:0] */
+#define WM831X_TCH_RPU_SHIFT                         0  /* TCH_RPU - [3:0] */
+#define WM831X_TCH_RPU_WIDTH                         4  /* TCH_RPU - [3:0] */
+
+/*
+ * R16426-8 (0x402A-C) - Touch Data X/Y/X
+ */
+#define WM831X_TCH_PD                           0x8000  /* TCH_PD1 */
+#define WM831X_TCH_DATA_MASK                    0x0FFF  /* TCH_DATA - [11:0] */
+#define WM831X_TCH_DATA_SHIFT                        0  /* TCH_DATA - [11:0] */
+#define WM831X_TCH_DATA_WIDTH                       12  /* TCH_DATA - [11:0] */
+
+struct wm831x_ts {
+        struct input_dev *input_dev;
+        struct wm831x *wm831x;
+        unsigned int data_irq;
+        unsigned int pd_irq;
+        bool pressure;
+        bool pen_down;
+        struct work_struct pd_data_work;
+};
+
+static void wm831x_pd_data_work(struct work_struct *work)
+{
+        struct wm831x_ts *wm831x_ts =
+                container_of(work, struct wm831x_ts, pd_data_work);
+
+        if (wm831x_ts->pen_down) {
+                enable_irq(wm831x_ts->data_irq);
+                dev_dbg(wm831x_ts->wm831x->dev, "IRQ PD->DATA done\n");
+        } else {
+                enable_irq(wm831x_ts->pd_irq);
+                dev_dbg(wm831x_ts->wm831x->dev, "IRQ DATA->PD done\n");
+        }
+}
+
+static irqreturn_t wm831x_ts_data_irq(int irq, void *irq_data)
+{
+        struct wm831x_ts *wm831x_ts = irq_data;
+        struct wm831x *wm831x = wm831x_ts->wm831x;
+        static int data_types[] = { ABS_X, ABS_Y, ABS_PRESSURE };
+        u16 data[3];
+        int count;
+        int i, ret;
+
+        if (wm831x_ts->pressure)
+                count = 3;
+        else
+                count = 2;
+
+        wm831x_set_bits(wm831x, WM831X_INTERRUPT_STATUS_1,
+                        WM831X_TCHDATA_EINT, WM831X_TCHDATA_EINT);
+
+        ret = wm831x_bulk_read(wm831x, WM831X_TOUCH_DATA_X, count,
+                               data);
+        if (ret != 0) {
+                dev_err(wm831x->dev, "Failed to read touch data: %d\n",
+                        ret);
+                return IRQ_NONE;
+        }
+
+        /*
+         * We get a pen down reading on every reading, report pen up if any
+         * individual reading does so.
+         */
+        wm831x_ts->pen_down = true;
+        for (i = 0; i < count; i++) {
+                if (!(data[i] & WM831X_TCH_PD)) {
+                        wm831x_ts->pen_down = false;
+                        continue;
+                }
+                input_report_abs(wm831x_ts->input_dev, data_types[i],
+                                 data[i] & WM831X_TCH_DATA_MASK);
+        }
+
+        if (!wm831x_ts->pen_down) {
+                /* Switch from data to pen down */
+                dev_dbg(wm831x->dev, "IRQ DATA->PD\n");
+
+                disable_irq_nosync(wm831x_ts->data_irq);
+
+                /* Don't need data any more */
+                wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
+                                WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA |
+                                WM831X_TCH_Z_ENA, 0);
+
+                /* Flush any final samples that arrived while reading */
+                wm831x_set_bits(wm831x, WM831X_INTERRUPT_STATUS_1,
+                                WM831X_TCHDATA_EINT, WM831X_TCHDATA_EINT);
+
+                wm831x_bulk_read(wm831x, WM831X_TOUCH_DATA_X, count, data);
+
+                if (wm831x_ts->pressure)
+                        input_report_abs(wm831x_ts->input_dev,
+                                         ABS_PRESSURE, 0);
+
+                input_report_key(wm831x_ts->input_dev, BTN_TOUCH, 0);
+
+                schedule_work(&wm831x_ts->pd_data_work);
+        } else {
+                input_report_key(wm831x_ts->input_dev, BTN_TOUCH, 1);
+        }
+
+        input_sync(wm831x_ts->input_dev);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t wm831x_ts_pen_down_irq(int irq, void *irq_data)
+{
+        struct wm831x_ts *wm831x_ts = irq_data;
+        struct wm831x *wm831x = wm831x_ts->wm831x;
+        int ena = 0;
+
+        if (wm831x_ts->pen_down)
+                return IRQ_HANDLED;
+
+        disable_irq_nosync(wm831x_ts->pd_irq);
+
+        /* Start collecting data */
+        if (wm831x_ts->pressure)
+                ena |= WM831X_TCH_Z_ENA;
+
+        wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
+                        WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA | WM831X_TCH_Z_ENA,
+                        WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA | ena);
+
+        wm831x_set_bits(wm831x, WM831X_INTERRUPT_STATUS_1,
+                        WM831X_TCHPD_EINT, WM831X_TCHPD_EINT);
+
+        wm831x_ts->pen_down = true;
+
+        /* Switch from pen down to data */
+        dev_dbg(wm831x->dev, "IRQ PD->DATA\n");
+        schedule_work(&wm831x_ts->pd_data_work);
+
+        return IRQ_HANDLED;
+}
+
+static int wm831x_ts_input_open(struct input_dev *idev)
+{
+        struct wm831x_ts *wm831x_ts = input_get_drvdata(idev);
+        struct wm831x *wm831x = wm831x_ts->wm831x;
+
+        wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
+                        WM831X_TCH_ENA | WM831X_TCH_CVT_ENA |
+                        WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA |
+                        WM831X_TCH_Z_ENA, WM831X_TCH_ENA);
+
+        wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
+                        WM831X_TCH_CVT_ENA, WM831X_TCH_CVT_ENA);
+
+        return 0;
+}
+
+static void wm831x_ts_input_close(struct input_dev *idev)
+{
+        struct wm831x_ts *wm831x_ts = input_get_drvdata(idev);
+        struct wm831x *wm831x = wm831x_ts->wm831x;
+
+        /* Shut the controller down, disabling all other functionality too */
+        wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
+                        WM831X_TCH_ENA | WM831X_TCH_X_ENA |
+                        WM831X_TCH_Y_ENA | WM831X_TCH_Z_ENA, 0);
+
+        /* Make sure any pending IRQs are done, the above will prevent
+         * new ones firing.
+         */
+        synchronize_irq(wm831x_ts->data_irq);
+        synchronize_irq(wm831x_ts->pd_irq);
+
+        /* Make sure the IRQ completion work is quiesced */
+        flush_work_sync(&wm831x_ts->pd_data_work);
+
+        /* If we ended up with the pen down then make sure we revert back
+         * to pen detection state for the next time we start up.
+         */
+        if (wm831x_ts->pen_down) {
+                disable_irq(wm831x_ts->data_irq);
+                enable_irq(wm831x_ts->pd_irq);
+                wm831x_ts->pen_down = false;
+        }
+}
+
+static __devinit int wm831x_ts_probe(struct platform_device *pdev)
+{
+        struct wm831x_ts *wm831x_ts;
+        struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
+        struct wm831x_pdata *core_pdata = dev_get_platdata(pdev->dev.parent);
+        struct wm831x_touch_pdata *pdata = NULL;
+        struct input_dev *input_dev;
+        int error, irqf;
+
+        if (core_pdata)
+                pdata = core_pdata->touch;
+
+        wm831x_ts = kzalloc(sizeof(struct wm831x_ts), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!wm831x_ts || !input_dev) {
+                error = -ENOMEM;
+                goto err_alloc;
+        }
+
+        wm831x_ts->wm831x = wm831x;
+        wm831x_ts->input_dev = input_dev;
+        INIT_WORK(&wm831x_ts->pd_data_work, wm831x_pd_data_work);
+
+        /*
+         * If we have a direct IRQ use it, otherwise use the interrupt
+         * from the WM831x IRQ controller.
+         */
+        if (pdata && pdata->data_irq)
+                wm831x_ts->data_irq = pdata->data_irq;
+        else
+                wm831x_ts->data_irq = platform_get_irq_byname(pdev, "TCHDATA");
+
+        if (pdata && pdata->pd_irq)
+                wm831x_ts->pd_irq = pdata->pd_irq;
+        else
+                wm831x_ts->pd_irq = platform_get_irq_byname(pdev, "TCHPD");
+
+        if (pdata)
+                wm831x_ts->pressure = pdata->pressure;
+        else
+                wm831x_ts->pressure = true;
+
+        /* Five wire touchscreens can't report pressure */
+        if (pdata && pdata->fivewire) {
+                wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_2,
+                                WM831X_TCH_5WIRE, WM831X_TCH_5WIRE);
+
+                /* Pressure measurements are not possible for five wire mode */
+                WARN_ON(pdata->pressure && pdata->fivewire);
+                wm831x_ts->pressure = false;
+        } else {
+                wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_2,
+                                WM831X_TCH_5WIRE, 0);
+        }
+
+        if (pdata) {
+                switch (pdata->isel) {
+                default:
+                        dev_err(&pdev->dev, "Unsupported ISEL setting: %d\n",
+                                pdata->isel);
+                        /* Fall through */
+                case 200:
+                case 0:
+                        wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_2,
+                                        WM831X_TCH_ISEL, 0);
+                        break;
+                case 400:
+                        wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_2,
+                                        WM831X_TCH_ISEL, WM831X_TCH_ISEL);
+                        break;
+                }
+        }
+
+        wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_2,
+                        WM831X_TCH_PDONLY, 0);
+
+        /* Default to 96 samples/sec */
+        wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
+                        WM831X_TCH_RATE_MASK, 6);
+
+        if (pdata && pdata->data_irqf)
+                irqf = pdata->data_irqf;
+        else
+                irqf = IRQF_TRIGGER_HIGH;
+
+        error = request_threaded_irq(wm831x_ts->data_irq,
+                                     NULL, wm831x_ts_data_irq,
+                                     irqf | IRQF_ONESHOT,
+                                     "Touchscreen data", wm831x_ts);
+        if (error) {
+                dev_err(&pdev->dev, "Failed to request data IRQ %d: %d\n",
+                        wm831x_ts->data_irq, error);
+                goto err_alloc;
+        }
+        disable_irq(wm831x_ts->data_irq);
+
+        if (pdata && pdata->pd_irqf)
+                irqf = pdata->pd_irqf;
+        else
+                irqf = IRQF_TRIGGER_HIGH;
+
+        error = request_threaded_irq(wm831x_ts->pd_irq,
+                                     NULL, wm831x_ts_pen_down_irq,
+                                     irqf | IRQF_ONESHOT,
+                                     "Touchscreen pen down", wm831x_ts);
+        if (error) {
+                dev_err(&pdev->dev, "Failed to request pen down IRQ %d: %d\n",
+                        wm831x_ts->pd_irq, error);
+                goto err_data_irq;
+        }
+
+        /* set up touch configuration */
+        input_dev->name = "WM831x touchscreen";
+        input_dev->phys = "wm831x";
+        input_dev->open = wm831x_ts_input_open;
+        input_dev->close = wm831x_ts_input_close;
+
+        __set_bit(EV_ABS, input_dev->evbit);
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(BTN_TOUCH, input_dev->keybit);
+
+        input_set_abs_params(input_dev, ABS_X, 0, 4095, 5, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, 4095, 5, 0);
+        if (wm831x_ts->pressure)
+                input_set_abs_params(input_dev, ABS_PRESSURE, 0, 4095, 5, 0);
+
+        input_set_drvdata(input_dev, wm831x_ts);
+        input_dev->dev.parent = &pdev->dev;
+
+        error = input_register_device(input_dev);
+        if (error)
+                goto err_pd_irq;
+
+        platform_set_drvdata(pdev, wm831x_ts);
+        return 0;
+
+err_pd_irq:
+        free_irq(wm831x_ts->pd_irq, wm831x_ts);
+err_data_irq:
+        free_irq(wm831x_ts->data_irq, wm831x_ts);
+err_alloc:
+        input_free_device(input_dev);
+        kfree(wm831x_ts);
+
+        return error;
+}
+
+static __devexit int wm831x_ts_remove(struct platform_device *pdev)
+{
+        struct wm831x_ts *wm831x_ts = platform_get_drvdata(pdev);
+
+        free_irq(wm831x_ts->pd_irq, wm831x_ts);
+        free_irq(wm831x_ts->data_irq, wm831x_ts);
+        input_unregister_device(wm831x_ts->input_dev);
+        kfree(wm831x_ts);
+
+        platform_set_drvdata(pdev, NULL);
+        return 0;
+}
+
+static struct platform_driver wm831x_ts_driver = {
+        .driver = {
+                .name = "wm831x-touch",
+                .owner = THIS_MODULE,
+        },
+        .probe = wm831x_ts_probe,
+        .remove = __devexit_p(wm831x_ts_remove),
+};
+
+static int __init wm831x_ts_init(void)
+{
+        return platform_driver_register(&wm831x_ts_driver);
+}
+module_init(wm831x_ts_init);
+
+static void __exit wm831x_ts_exit(void)
+{
+        platform_driver_unregister(&wm831x_ts_driver);
+}
+module_exit(wm831x_ts_exit);
+
+/* Module information */
+MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
+MODULE_DESCRIPTION("WM831x PMIC touchscreen driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:wm831x-touch");
diff --git a/drivers/input/touchscreen/wm9705.c b/drivers/input/touchscreen/wm9705.c
index 6b5be742c27d..98e61175d3f5 100644
--- a/drivers/input/touchscreen/wm9705.c
+++ b/drivers/input/touchscreen/wm9705.c
@@ -306,7 +306,7 @@ static int wm9705_acc_enable(struct wm97xx *wm, int enable)
         dig2 = wm->dig[2];
 
         if (enable) {
-                /* continous mode */
+                /* continuous mode */
                 if (wm->mach_ops->acc_startup &&
                     (ret = wm->mach_ops->acc_startup(wm)) < 0)
                         return ret;
diff --git a/drivers/input/touchscreen/wm9712.c b/drivers/input/touchscreen/wm9712.c
index 7490b05c3566..2bc2fb801009 100644
--- a/drivers/input/touchscreen/wm9712.c
+++ b/drivers/input/touchscreen/wm9712.c
@@ -419,7 +419,7 @@ static int wm9712_acc_enable(struct wm97xx *wm, int enable)
         dig2 = wm->dig[2];
 
         if (enable) {
-                /* continous mode */
+                /* continuous mode */
                 if (wm->mach_ops->acc_startup) {
                         ret = wm->mach_ops->acc_startup(wm);
                         if (ret < 0)
diff --git a/drivers/input/touchscreen/wm9713.c b/drivers/input/touchscreen/wm9713.c
index 238b5132712e..73ec99568f12 100644
--- a/drivers/input/touchscreen/wm9713.c
+++ b/drivers/input/touchscreen/wm9713.c
@@ -431,7 +431,7 @@ static int wm9713_acc_enable(struct wm97xx *wm, int enable)
         dig3 = wm->dig[2];
 
         if (enable) {
-                /* continous mode */
+                /* continuous mode */
                 if (wm->mach_ops->acc_startup &&
                         (ret = wm->mach_ops->acc_startup(wm)) < 0)
                         return ret;
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index cbfef1ea7e30..5dbe73af2f8f 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -125,6 +125,8 @@ int wm97xx_read_aux_adc(struct wm97xx *wm, u16 adcsel)
 {
         int power_adc = 0, auxval;
         u16 power = 0;
+        int rc = 0;
+        int timeout = 0;
 
         /* get codec */
         mutex_lock(&wm->codec_mutex);
@@ -143,7 +145,9 @@ int wm97xx_read_aux_adc(struct wm97xx *wm, u16 adcsel)
 
         /* Turn polling mode on to read AUX ADC */
         wm->pen_probably_down = 1;
-        wm->codec->poll_sample(wm, adcsel, &auxval);
+
+        while (rc != RC_VALID && timeout++ < 5)
+                rc = wm->codec->poll_sample(wm, adcsel, &auxval);
 
         if (power_adc)
                 wm97xx_reg_write(wm, AC97_EXTENDED_MID, power | 0x8000);
@@ -152,8 +156,15 @@ int wm97xx_read_aux_adc(struct wm97xx *wm, u16 adcsel)
 
         wm->pen_probably_down = 0;
 
+        if (timeout >= 5) {
+                dev_err(wm->dev,
+                        "timeout reading auxadc %d, disabling digitiser\n",
+                        adcsel);
+                wm->codec->dig_enable(wm, false);
+        }
+
         mutex_unlock(&wm->codec_mutex);
-        return auxval & 0xfff;
+        return (rc == RC_VALID ? auxval & 0xfff : -EBUSY);
 }
 EXPORT_SYMBOL_GPL(wm97xx_read_aux_adc);
 
@@ -324,7 +335,7 @@ static void wm97xx_pen_irq_worker(struct work_struct *work)
          */
         if (!wm->mach_ops->acc_enabled || wm->mach_ops->acc_pen_down) {
                 if (wm->pen_is_down && !pen_was_down) {
-                        /* Data is not availiable immediately on pen down */
+                        /* Data is not available immediately on pen down */
                         queue_delayed_work(wm->ts_workq, &wm->ts_reader, 1);
                 }
 
@@ -343,7 +354,7 @@ static void wm97xx_pen_irq_worker(struct work_struct *work)
  * Codec PENDOWN irq handler
  *
  * We have to disable the codec interrupt in the handler because it
- * can take upto 1ms to clear the interrupt source. We schedule a task
+ * can take up to 1ms to clear the interrupt source. We schedule a task
  * in a work queue to do the actual interaction with the chip.  The
  * interrupt is then enabled again in the slow handler when the source
  * has been cleared.
@@ -684,8 +695,7 @@ static int wm97xx_probe(struct device *dev)
  touch_reg_err:
         platform_device_put(wm->touch_dev);
  touch_err:
-        platform_device_unregister(wm->battery_dev);
-        wm->battery_dev = NULL;
+        platform_device_del(wm->battery_dev);
  batt_reg_err:
         platform_device_put(wm->battery_dev);
  batt_err:
diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c b/drivers/input/touchscreen/zylonite-wm97xx.c
index 048849867643..5b0f15ec874a 100644
--- a/drivers/input/touchscreen/zylonite-wm97xx.c
+++ b/drivers/input/touchscreen/zylonite-wm97xx.c
@@ -193,7 +193,7 @@ static int zylonite_wm97xx_probe(struct platform_device *pdev)
                 gpio_touch_irq = mfp_to_gpio(MFP_PIN_GPIO26);
 
         wm->pen_irq = IRQ_GPIO(gpio_touch_irq);
-        set_irq_type(IRQ_GPIO(gpio_touch_irq), IRQ_TYPE_EDGE_BOTH);
+        irq_set_irq_type(IRQ_GPIO(gpio_touch_irq), IRQ_TYPE_EDGE_BOTH);
 
         wm97xx_config_gpio(wm, WM97XX_GPIO_13, WM97XX_GPIO_IN,
                            WM97XX_GPIO_POL_HIGH,