7 files changed, 1137 insertions, 5 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index b01fd61dadcc..72e2712c7e2a 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -111,6 +111,15 @@ config TOUCHSCREEN_DA9034
           Say Y here to enable the support for the touchscreen found
           on Dialog Semiconductor DA9034 PMIC.
 
+config TOUCHSCREEN_EETI
+        tristate "EETI touchscreen panel support"
+        depends on I2C
+        help
+          Say Y here to enable support for I2C connected EETI touch panels.
+
+          To compile this driver as a module, choose M here: the
+          module will be called eeti_ts.
+
 config TOUCHSCREEN_FUJITSU
         tristate "Fujitsu serial touchscreen"
         select SERIO
@@ -341,6 +350,21 @@ config TOUCHSCREEN_WM9713
           Say Y here to enable support for the Wolfson Microelectronics
           WM9713 touchscreen controller.
 
+config TOUCHSCREEN_WM97XX_ATMEL
+        tristate "WM97xx Atmel accelerated touch"
+        depends on TOUCHSCREEN_WM97XX && (AVR32 || ARCH_AT91)
+        help
+          Say Y here for support for streaming mode with WM97xx touchscreens
+          on Atmel AT91 or AVR32 systems with an AC97C module.
+
+          Be aware that this will use channel B in the controller for
+          streaming data, this must not conflict with other AC97C drivers.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the module will
+          be called atmel-wm97xx.
+
 config TOUCHSCREEN_WM97XX_MAINSTONE
         tristate "WM97xx Mainstone accelerated touch"
         depends on TOUCHSCREEN_WM97XX && ARCH_PXA
@@ -466,4 +490,12 @@ config TOUCHSCREEN_TSC2007
           To compile this driver as a module, choose M here: the
           module will be called tsc2007.
 
+config TOUCHSCREEN_W90X900
+        tristate "W90P910 touchscreen driver"
+        help
+          Say Y here if you have a W90P910 based touchscreen.
+
+          To compile this driver as a module, choose M here: the
+          module will be called w90p910_ts.
+
 endif
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 6700f7b9d165..3e1c5e0b952f 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_TOUCHSCREEN_ATMEL_TSADCC)	+= atmel_tsadcc.o
 obj-$(CONFIG_TOUCHSCREEN_BITSY)         += h3600_ts_input.o
 obj-$(CONFIG_TOUCHSCREEN_CORGI)         += corgi_ts.o
 obj-$(CONFIG_TOUCHSCREEN_GUNZE)         += gunze.o
+obj-$(CONFIG_TOUCHSCREEN_EETI)          += eeti_ts.o
 obj-$(CONFIG_TOUCHSCREEN_ELO)           += elo.o
 obj-$(CONFIG_TOUCHSCREEN_FUJITSU)       += fujitsu_ts.o
 obj-$(CONFIG_TOUCHSCREEN_INEXIO)        += inexio.o
@@ -35,5 +36,7 @@ obj-$(CONFIG_TOUCHSCREEN_DA9034)	+= da9034-ts.o
 wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9705)  += wm9705.o
 wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712)  += wm9712.o
 wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713)  += wm9713.o
+obj-$(CONFIG_TOUCHSCREEN_WM97XX_ATMEL)  += atmel-wm97xx.o
 obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE)      += mainstone-wm97xx.o
 obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE)       += zylonite-wm97xx.o
+obj-$(CONFIG_TOUCHSCREEN_W90X900)       += w90p910_ts.o
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 2b01e56568f8..ba9d38c3f412 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -83,6 +83,7 @@ struct ads7846_packet {
 struct ads7846 {
         struct input_dev        *input;
         char                    phys[32];
+        char                    name[32];
 
         struct spi_device       *spi;
 
@@ -97,6 +98,8 @@ struct ads7846 {
         u16                     x_plate_ohms;
         u16                     pressure_max;
 
+        bool                    swap_xy;
+
         struct ads7846_packet   *packet;
 
         struct spi_transfer     xfer[18];
@@ -599,6 +602,10 @@ static void ads7846_rx(void *ads)
                         dev_dbg(&ts->spi->dev, "DOWN\n");
 #endif
                 }
+
+                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, Rt);
@@ -917,6 +924,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
         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;
@@ -958,8 +966,9 @@ static int __devinit ads7846_probe(struct spi_device *spi)
         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 = "ADS784x Touchscreen";
+        input_dev->name = ts->name;
         input_dev->phys = ts->phys;
         input_dev->dev.parent = &spi->dev;
 
@@ -1141,9 +1150,15 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 
         if (request_irq(spi->irq, ads7846_irq, IRQF_TRIGGER_FALLING,
                         spi->dev.driver->name, ts)) {
-                dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
-                err = -EBUSY;
-                goto err_free_gpio;
+                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);
+                if (err) {
+                        dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
+                        goto err_free_gpio;
+                }
         }
 
         err = ads784x_hwmon_register(spi, ts);
diff --git a/drivers/input/touchscreen/atmel-wm97xx.c b/drivers/input/touchscreen/atmel-wm97xx.c
new file mode 100644
index 000000000000..35377f583e28
--- /dev/null
+++ b/drivers/input/touchscreen/atmel-wm97xx.c
@@ -0,0 +1,446 @@
+/*
+ * Atmel AT91 and AVR32 continuous touch screen driver for Wolfson WM97xx AC97
+ * codecs.
+ *
+ * Copyright (C) 2008 - 2009 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/wm97xx.h>
+#include <linux/timer.h>
+#include <linux/gpio.h>
+#include <linux/io.h>
+
+#define AC97C_ICA               0x10
+#define AC97C_CBRHR             0x30
+#define AC97C_CBSR              0x38
+#define AC97C_CBMR              0x3c
+#define AC97C_IER               0x54
+#define AC97C_IDR               0x58
+
+#define AC97C_RXRDY             (1 << 4)
+#define AC97C_OVRUN             (1 << 5)
+
+#define AC97C_CMR_SIZE_20       (0 << 16)
+#define AC97C_CMR_SIZE_18       (1 << 16)
+#define AC97C_CMR_SIZE_16       (2 << 16)
+#define AC97C_CMR_SIZE_10       (3 << 16)
+#define AC97C_CMR_CEM_LITTLE    (1 << 18)
+#define AC97C_CMR_CEM_BIG       (0 << 18)
+#define AC97C_CMR_CENA          (1 << 21)
+
+#define AC97C_INT_CBEVT         (1 << 4)
+
+#define AC97C_SR_CAEVT          (1 << 3)
+
+#define AC97C_CH_MASK(slot)                                             \
+        (0x7 << (3 * (slot - 3)))
+#define AC97C_CH_ASSIGN(slot, channel)                                  \
+        (AC97C_CHANNEL_##channel << (3 * (slot - 3)))
+#define AC97C_CHANNEL_NONE      0x0
+#define AC97C_CHANNEL_B         0x2
+
+#define ac97c_writel(chip, reg, val)                    \
+        __raw_writel((val), (chip)->regs + AC97C_##reg)
+#define ac97c_readl(chip, reg)                          \
+        __raw_readl((chip)->regs + AC97C_##reg)
+
+#ifdef CONFIG_CPU_AT32AP700X
+#define ATMEL_WM97XX_AC97C_IOMEM        (0xfff02800)
+#define ATMEL_WM97XX_AC97C_IRQ          (29)
+#define ATMEL_WM97XX_GPIO_DEFAULT       (32+16) /* Pin 16 on port B. */
+#else
+#error Unkown CPU, this driver only supports AT32AP700X CPUs.
+#endif
+
+struct continuous {
+        u16 id;    /* codec id */
+        u8 code;   /* continuous code */
+        u8 reads;  /* number of coord reads per read cycle */
+        u32 speed; /* number of coords per second */
+};
+
+#define WM_READS(sp) ((sp / HZ) + 1)
+
+static const struct continuous cinfo[] = {
+        {WM9705_ID2, 0, WM_READS(94), 94},
+        {WM9705_ID2, 1, WM_READS(188), 188},
+        {WM9705_ID2, 2, WM_READS(375), 375},
+        {WM9705_ID2, 3, WM_READS(750), 750},
+        {WM9712_ID2, 0, WM_READS(94), 94},
+        {WM9712_ID2, 1, WM_READS(188), 188},
+        {WM9712_ID2, 2, WM_READS(375), 375},
+        {WM9712_ID2, 3, WM_READS(750), 750},
+        {WM9713_ID2, 0, WM_READS(94), 94},
+        {WM9713_ID2, 1, WM_READS(120), 120},
+        {WM9713_ID2, 2, WM_READS(154), 154},
+        {WM9713_ID2, 3, WM_READS(188), 188},
+};
+
+/* Continuous speed index. */
+static int sp_idx;
+
+/*
+ * Pen sampling frequency (Hz) in continuous mode.
+ */
+static int cont_rate = 188;
+module_param(cont_rate, int, 0);
+MODULE_PARM_DESC(cont_rate, "Sampling rate in continuous mode (Hz)");
+
+/*
+ * Pen down detection.
+ *
+ * This driver can either poll or use an interrupt to indicate a pen down
+ * event. If the irq request fails then it will fall back to polling mode.
+ */
+static int pen_int = 1;
+module_param(pen_int, int, 0);
+MODULE_PARM_DESC(pen_int, "Pen down detection (1 = interrupt, 0 = polling)");
+
+/*
+ * Pressure readback.
+ *
+ * Set to 1 to read back pen down pressure.
+ */
+static int pressure;
+module_param(pressure, int, 0);
+MODULE_PARM_DESC(pressure, "Pressure readback (1 = pressure, 0 = no pressure)");
+
+/*
+ * AC97 touch data slot.
+ *
+ * Touch screen readback data ac97 slot.
+ */
+static int ac97_touch_slot = 5;
+module_param(ac97_touch_slot, int, 0);
+MODULE_PARM_DESC(ac97_touch_slot, "Touch screen data slot AC97 number");
+
+/*
+ * GPIO line number.
+ *
+ * Set to GPIO number where the signal from the WM97xx device is hooked up.
+ */
+static int atmel_gpio_line = ATMEL_WM97XX_GPIO_DEFAULT;
+module_param(atmel_gpio_line, int, 0);
+MODULE_PARM_DESC(atmel_gpio_line, "GPIO line number connected to WM97xx");
+
+struct atmel_wm97xx {
+        struct wm97xx           *wm;
+        struct timer_list       pen_timer;
+        void __iomem            *regs;
+        unsigned long           ac97c_irq;
+        unsigned long           gpio_pen;
+        unsigned long           gpio_irq;
+        unsigned short          x;
+        unsigned short          y;
+};
+
+static irqreturn_t atmel_wm97xx_channel_b_interrupt(int irq, void *dev_id)
+{
+        struct atmel_wm97xx *atmel_wm97xx = dev_id;
+        struct wm97xx *wm = atmel_wm97xx->wm;
+        int status = ac97c_readl(atmel_wm97xx, CBSR);
+        irqreturn_t retval = IRQ_NONE;
+
+        if (status & AC97C_OVRUN) {
+                dev_dbg(&wm->touch_dev->dev, "AC97C overrun\n");
+                ac97c_readl(atmel_wm97xx, CBRHR);
+                retval = IRQ_HANDLED;
+        } else if (status & AC97C_RXRDY) {
+                u16 data;
+                u16 value;
+                u16 source;
+                u16 pen_down;
+
+                data = ac97c_readl(atmel_wm97xx, CBRHR);
+                value = data & 0x0fff;
+                source = data & WM97XX_ADCSRC_MASK;
+                pen_down = (data & WM97XX_PEN_DOWN) >> 8;
+
+                if (source == WM97XX_ADCSEL_X)
+                        atmel_wm97xx->x = value;
+                if (source == WM97XX_ADCSEL_Y)
+                        atmel_wm97xx->y = value;
+
+                if (!pressure && source == WM97XX_ADCSEL_Y) {
+                        input_report_abs(wm->input_dev, ABS_X, atmel_wm97xx->x);
+                        input_report_abs(wm->input_dev, ABS_Y, atmel_wm97xx->y);
+                        input_report_key(wm->input_dev, BTN_TOUCH, pen_down);
+                        input_sync(wm->input_dev);
+                } else if (pressure && source == WM97XX_ADCSEL_PRES) {
+                        input_report_abs(wm->input_dev, ABS_X, atmel_wm97xx->x);
+                        input_report_abs(wm->input_dev, ABS_Y, atmel_wm97xx->y);
+                        input_report_abs(wm->input_dev, ABS_PRESSURE, value);
+                        input_report_key(wm->input_dev, BTN_TOUCH, value);
+                        input_sync(wm->input_dev);
+                }
+
+                retval = IRQ_HANDLED;
+        }
+
+        return retval;
+}
+
+static void atmel_wm97xx_acc_pen_up(struct wm97xx *wm)
+{
+        struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(wm->touch_dev);
+        struct input_dev *input_dev = wm->input_dev;
+        int pen_down = gpio_get_value(atmel_wm97xx->gpio_pen);
+
+        if (pen_down != 0) {
+                mod_timer(&atmel_wm97xx->pen_timer,
+                          jiffies + msecs_to_jiffies(1));
+        } else {
+                if (pressure)
+                        input_report_abs(input_dev, ABS_PRESSURE, 0);
+                input_report_key(input_dev, BTN_TOUCH, 0);
+                input_sync(input_dev);
+        }
+}
+
+static void atmel_wm97xx_pen_timer(unsigned long data)
+{
+        atmel_wm97xx_acc_pen_up((struct wm97xx *)data);
+}
+
+static int atmel_wm97xx_acc_startup(struct wm97xx *wm)
+{
+        struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(wm->touch_dev);
+        int idx = 0;
+
+        if (wm->ac97 == NULL)
+                return -ENODEV;
+
+        for (idx = 0; idx < ARRAY_SIZE(cinfo); idx++) {
+                if (wm->id != cinfo[idx].id)
+                        continue;
+
+                sp_idx = idx;
+
+                if (cont_rate <= cinfo[idx].speed)
+                        break;
+        }
+
+        wm->acc_rate = cinfo[sp_idx].code;
+        wm->acc_slot = ac97_touch_slot;
+        dev_info(&wm->touch_dev->dev, "atmel accelerated touchscreen driver, "
+                        "%d samples/sec\n", cinfo[sp_idx].speed);
+
+        if (pen_int) {
+                unsigned long reg;
+
+                wm->pen_irq = atmel_wm97xx->gpio_irq;
+
+                switch (wm->id) {
+                case WM9712_ID2: /* Fall through. */
+                case WM9713_ID2:
+                        /*
+                         * Use GPIO 13 (PEN_DOWN) to assert GPIO line 3
+                         * (PENDOWN).
+                         */
+                        wm97xx_config_gpio(wm, WM97XX_GPIO_13, WM97XX_GPIO_IN,
+                                        WM97XX_GPIO_POL_HIGH,
+                                        WM97XX_GPIO_STICKY,
+                                        WM97XX_GPIO_WAKE);
+                        wm97xx_config_gpio(wm, WM97XX_GPIO_3, WM97XX_GPIO_OUT,
+                                        WM97XX_GPIO_POL_HIGH,
+                                        WM97XX_GPIO_NOTSTICKY,
+                                        WM97XX_GPIO_NOWAKE);
+                case WM9705_ID2: /* Fall through. */
+                        /*
+                         * Enable touch data slot in AC97 controller channel B.
+                         */
+                        reg = ac97c_readl(atmel_wm97xx, ICA);
+                        reg &= ~AC97C_CH_MASK(wm->acc_slot);
+                        reg |= AC97C_CH_ASSIGN(wm->acc_slot, B);
+                        ac97c_writel(atmel_wm97xx, ICA, reg);
+
+                        /*
+                         * Enable channel and interrupt for RXRDY and OVERRUN.
+                         */
+                        ac97c_writel(atmel_wm97xx, CBMR, AC97C_CMR_CENA
+                                        | AC97C_CMR_CEM_BIG
+                                        | AC97C_CMR_SIZE_16
+                                        | AC97C_OVRUN
+                                        | AC97C_RXRDY);
+                        /* Dummy read to empty RXRHR. */
+                        ac97c_readl(atmel_wm97xx, CBRHR);
+                        /*
+                         * Enable interrupt for channel B in the AC97
+                         * controller.
+                         */
+                        ac97c_writel(atmel_wm97xx, IER, AC97C_INT_CBEVT);
+                        break;
+                default:
+                        dev_err(&wm->touch_dev->dev, "pen down irq not "
+                                        "supported on this device\n");
+                        pen_int = 0;
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+static void atmel_wm97xx_acc_shutdown(struct wm97xx *wm)
+{
+        if (pen_int) {
+                struct atmel_wm97xx *atmel_wm97xx =
+                        platform_get_drvdata(wm->touch_dev);
+                unsigned long ica;
+
+                switch (wm->id & 0xffff) {
+                case WM9705_ID2: /* Fall through. */
+                case WM9712_ID2: /* Fall through. */
+                case WM9713_ID2:
+                        /* Disable slot and turn off channel B interrupts. */
+                        ica = ac97c_readl(atmel_wm97xx, ICA);
+                        ica &= ~AC97C_CH_MASK(wm->acc_slot);
+                        ac97c_writel(atmel_wm97xx, ICA, ica);
+                        ac97c_writel(atmel_wm97xx, IDR, AC97C_INT_CBEVT);
+                        ac97c_writel(atmel_wm97xx, CBMR, 0);
+                        wm->pen_irq = 0;
+                        break;
+                default:
+                        dev_err(&wm->touch_dev->dev, "unknown codec\n");
+                        break;
+                }
+        }
+}
+
+static void atmel_wm97xx_irq_enable(struct wm97xx *wm, int enable)
+{
+        /* Intentionally left empty. */
+}
+
+static struct wm97xx_mach_ops atmel_mach_ops = {
+        .acc_enabled    = 1,
+        .acc_pen_up     = atmel_wm97xx_acc_pen_up,
+        .acc_startup    = atmel_wm97xx_acc_startup,
+        .acc_shutdown   = atmel_wm97xx_acc_shutdown,
+        .irq_enable     = atmel_wm97xx_irq_enable,
+        .irq_gpio       = WM97XX_GPIO_3,
+};
+
+static int __init atmel_wm97xx_probe(struct platform_device *pdev)
+{
+        struct wm97xx *wm = platform_get_drvdata(pdev);
+        struct atmel_wm97xx *atmel_wm97xx;
+        int ret;
+
+        atmel_wm97xx = kzalloc(sizeof(struct atmel_wm97xx), GFP_KERNEL);
+        if (!atmel_wm97xx) {
+                dev_dbg(&pdev->dev, "out of memory\n");
+                return -ENOMEM;
+        }
+
+        atmel_wm97xx->wm        = wm;
+        atmel_wm97xx->regs      = (void *)ATMEL_WM97XX_AC97C_IOMEM;
+        atmel_wm97xx->ac97c_irq = ATMEL_WM97XX_AC97C_IRQ;
+        atmel_wm97xx->gpio_pen  = atmel_gpio_line;
+        atmel_wm97xx->gpio_irq  = gpio_to_irq(atmel_wm97xx->gpio_pen);
+
+        setup_timer(&atmel_wm97xx->pen_timer, atmel_wm97xx_pen_timer,
+                        (unsigned long)wm);
+
+        ret = request_irq(atmel_wm97xx->ac97c_irq,
+                          atmel_wm97xx_channel_b_interrupt,
+                          IRQF_SHARED, "atmel-wm97xx-ch-b", atmel_wm97xx);
+        if (ret) {
+                dev_dbg(&pdev->dev, "could not request ac97c irq\n");
+                goto err;
+        }
+
+        platform_set_drvdata(pdev, atmel_wm97xx);
+
+        ret = wm97xx_register_mach_ops(wm, &atmel_mach_ops);
+        if (ret)
+                goto err_irq;
+
+        return ret;
+
+err_irq:
+        free_irq(atmel_wm97xx->ac97c_irq, atmel_wm97xx);
+err:
+        platform_set_drvdata(pdev, NULL);
+        kfree(atmel_wm97xx);
+        return ret;
+}
+
+static int __exit atmel_wm97xx_remove(struct platform_device *pdev)
+{
+        struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(pdev);
+        struct wm97xx *wm = atmel_wm97xx->wm;
+
+        ac97c_writel(atmel_wm97xx, IDR, AC97C_INT_CBEVT);
+        free_irq(atmel_wm97xx->ac97c_irq, atmel_wm97xx);
+        del_timer_sync(&atmel_wm97xx->pen_timer);
+        wm97xx_unregister_mach_ops(wm);
+        platform_set_drvdata(pdev, NULL);
+        kfree(atmel_wm97xx);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int atmel_wm97xx_suspend(struct platform_device *pdev, pm_message_t msg)
+{
+        struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(pdev);
+
+        ac97c_writel(atmel_wm97xx, IDR, AC97C_INT_CBEVT);
+        disable_irq(atmel_wm97xx->gpio_irq);
+        del_timer_sync(&atmel_wm97xx->pen_timer);
+
+        return 0;
+}
+
+static int atmel_wm97xx_resume(struct platform_device *pdev)
+{
+        struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(pdev);
+        struct wm97xx *wm = atmel_wm97xx->wm;
+
+        if (wm->input_dev->users) {
+                enable_irq(atmel_wm97xx->gpio_irq);
+                ac97c_writel(atmel_wm97xx, IER, AC97C_INT_CBEVT);
+        }
+
+        return 0;
+}
+#else
+#define atmel_wm97xx_suspend    NULL
+#define atmel_wm97xx_resume     NULL
+#endif
+
+static struct platform_driver atmel_wm97xx_driver = {
+        .remove         = __exit_p(atmel_wm97xx_remove),
+        .driver         = {
+                .name = "wm97xx-touch",
+        },
+        .suspend        = atmel_wm97xx_suspend,
+        .resume         = atmel_wm97xx_resume,
+};
+
+static int __init atmel_wm97xx_init(void)
+{
+        return platform_driver_probe(&atmel_wm97xx_driver, atmel_wm97xx_probe);
+}
+module_init(atmel_wm97xx_init);
+
+static void __exit atmel_wm97xx_exit(void)
+{
+        platform_driver_unregister(&atmel_wm97xx_driver);
+}
+module_exit(atmel_wm97xx_exit);
+
+MODULE_AUTHOR("Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>");
+MODULE_DESCRIPTION("wm97xx continuous touch driver for Atmel AT91 and AVR32");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c
new file mode 100644
index 000000000000..3ab92222a525
--- /dev/null
+++ b/drivers/input/touchscreen/eeti_ts.c
@@ -0,0 +1,286 @@
+/*
+ * Touch Screen driver for EETI's I2C connected touch screen panels
+ *   Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
+ *
+ * See EETI's software guide for the protocol specification:
+ *   http://home.eeti.com.tw/web20/eg/guide.htm
+ *
+ * Based on migor_ts.c
+ *   Copyright (c) 2008 Magnus Damm
+ *   Copyright (c) 2007 Ujjwal Pande <ujjwal@kenati.com>
+ *
+ * This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU  General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/i2c.h>
+#include <linux/timer.h>
+#include <linux/gpio.h>
+
+static int flip_x;
+module_param(flip_x, bool, 0644);
+MODULE_PARM_DESC(flip_x, "flip x coordinate");
+
+static int flip_y;
+module_param(flip_y, bool, 0644);
+MODULE_PARM_DESC(flip_y, "flip y coordinate");
+
+struct eeti_ts_priv {
+        struct i2c_client *client;
+        struct input_dev *input;
+        struct work_struct work;
+        struct mutex mutex;
+        int irq;
+};
+
+#define EETI_TS_BITDEPTH        (11)
+#define EETI_MAXVAL             ((1 << (EETI_TS_BITDEPTH + 1)) - 1)
+
+#define REPORT_BIT_PRESSED      (1 << 0)
+#define REPORT_BIT_AD0          (1 << 1)
+#define REPORT_BIT_AD1          (1 << 2)
+#define REPORT_BIT_HAS_PRESSURE (1 << 6)
+#define REPORT_RES_BITS(v)      (((v) >> 1) + EETI_TS_BITDEPTH)
+
+static void eeti_ts_read(struct work_struct *work)
+{
+        char buf[6];
+        unsigned int x, y, res, pressed, to = 100;
+        struct eeti_ts_priv *priv =
+                container_of(work, struct eeti_ts_priv, work);
+
+        mutex_lock(&priv->mutex);
+
+        while (!gpio_get_value(irq_to_gpio(priv->irq)) && --to)
+                i2c_master_recv(priv->client, buf, sizeof(buf));
+
+        if (!to) {
+                dev_err(&priv->client->dev,
+                        "unable to clear IRQ - line stuck?\n");
+                goto out;
+        }
+
+        /* drop non-report packets */
+        if (!(buf[0] & 0x80))
+                goto out;
+
+        pressed = buf[0] & REPORT_BIT_PRESSED;
+        res = REPORT_RES_BITS(buf[0] & (REPORT_BIT_AD0 | REPORT_BIT_AD1));
+        x = buf[2] | (buf[1] << 8);
+        y = buf[4] | (buf[3] << 8);
+
+        /* fix the range to 11 bits */
+        x >>= res - EETI_TS_BITDEPTH;
+        y >>= res - EETI_TS_BITDEPTH;
+
+        if (flip_x)
+                x = EETI_MAXVAL - x;
+
+        if (flip_y)
+                y = EETI_MAXVAL - y;
+
+        if (buf[0] & REPORT_BIT_HAS_PRESSURE)
+                input_report_abs(priv->input, ABS_PRESSURE, buf[5]);
+
+        input_report_abs(priv->input, ABS_X, x);
+        input_report_abs(priv->input, ABS_Y, y);
+        input_report_key(priv->input, BTN_TOUCH, !!pressed);
+        input_sync(priv->input);
+
+out:
+        mutex_unlock(&priv->mutex);
+}
+
+static irqreturn_t eeti_ts_isr(int irq, void *dev_id)
+{
+        struct eeti_ts_priv *priv = dev_id;
+
+         /* postpone I2C transactions as we are atomic */
+        schedule_work(&priv->work);
+
+        return IRQ_HANDLED;
+}
+
+static int eeti_ts_open(struct input_dev *dev)
+{
+        struct eeti_ts_priv *priv = input_get_drvdata(dev);
+
+        enable_irq(priv->irq);
+
+        /* Read the events once to arm the IRQ */
+        eeti_ts_read(&priv->work);
+
+        return 0;
+}
+
+static void eeti_ts_close(struct input_dev *dev)
+{
+        struct eeti_ts_priv *priv = input_get_drvdata(dev);
+
+        disable_irq(priv->irq);
+        cancel_work_sync(&priv->work);
+}
+
+static int __devinit eeti_ts_probe(struct i2c_client *client,
+                                   const struct i2c_device_id *idp)
+{
+        struct eeti_ts_priv *priv;
+        struct input_dev *input;
+        int err = -ENOMEM;
+
+        /* In contrast to what's described in the datasheet, there seems
+         * to be no way of probing the presence of that device using I2C
+         * commands. So we need to blindly believe it is there, and wait
+         * for interrupts to occur. */
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                dev_err(&client->dev, "failed to allocate driver data\n");
+                goto err0;
+        }
+
+        mutex_init(&priv->mutex);
+        input = input_allocate_device();
+
+        if (!input) {
+                dev_err(&client->dev, "Failed to allocate input device.\n");
+                goto err1;
+        }
+
+        input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+
+        input_set_abs_params(input, ABS_X, 0, EETI_MAXVAL, 0, 0);
+        input_set_abs_params(input, ABS_Y, 0, EETI_MAXVAL, 0, 0);
+        input_set_abs_params(input, ABS_PRESSURE, 0, 0xff, 0, 0);
+
+        input->name = client->name;
+        input->id.bustype = BUS_I2C;
+        input->dev.parent = &client->dev;
+        input->open = eeti_ts_open;
+        input->close = eeti_ts_close;
+
+        priv->client = client;
+        priv->input = input;
+        priv->irq = client->irq;
+
+        INIT_WORK(&priv->work, eeti_ts_read);
+        i2c_set_clientdata(client, priv);
+        input_set_drvdata(input, priv);
+
+        err = input_register_device(input);
+        if (err)
+                goto err1;
+
+        err = request_irq(priv->irq, eeti_ts_isr, IRQF_TRIGGER_FALLING,
+                          client->name, priv);
+        if (err) {
+                dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
+                goto err2;
+        }
+
+        /* Disable the irq for now. It will be enabled once the input device
+         * is opened. */
+        disable_irq(priv->irq);
+
+        device_init_wakeup(&client->dev, 0);
+        return 0;
+
+err2:
+        input_unregister_device(input);
+        input = NULL; /* so we dont try to free it below */
+err1:
+        input_free_device(input);
+        i2c_set_clientdata(client, NULL);
+        kfree(priv);
+err0:
+        return err;
+}
+
+static int __devexit eeti_ts_remove(struct i2c_client *client)
+{
+        struct eeti_ts_priv *priv = i2c_get_clientdata(client);
+
+        free_irq(priv->irq, priv);
+        input_unregister_device(priv->input);
+        i2c_set_clientdata(client, NULL);
+        kfree(priv);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int eeti_ts_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+        struct eeti_ts_priv *priv = i2c_get_clientdata(client);
+
+        if (device_may_wakeup(&client->dev))
+                enable_irq_wake(priv->irq);
+
+        return 0;
+}
+
+static int eeti_ts_resume(struct i2c_client *client)
+{
+        struct eeti_ts_priv *priv = i2c_get_clientdata(client);
+
+        if (device_may_wakeup(&client->dev))
+                disable_irq_wake(priv->irq);
+
+        return 0;
+}
+#else
+#define eeti_ts_suspend NULL
+#define eeti_ts_resume NULL
+#endif
+
+static const struct i2c_device_id eeti_ts_id[] = {
+        { "eeti_ts", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, eeti_ts_id);
+
+static struct i2c_driver eeti_ts_driver = {
+        .driver = {
+                .name = "eeti_ts",
+        },
+        .probe = eeti_ts_probe,
+        .remove = __devexit_p(eeti_ts_remove),
+        .suspend = eeti_ts_suspend,
+        .resume = eeti_ts_resume,
+        .id_table = eeti_ts_id,
+};
+
+static int __init eeti_ts_init(void)
+{
+        return i2c_add_driver(&eeti_ts_driver);
+}
+
+static void __exit eeti_ts_exit(void)
+{
+        i2c_del_driver(&eeti_ts_driver);
+}
+
+MODULE_DESCRIPTION("EETI Touchscreen driver");
+MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
+MODULE_LICENSE("GPL");
+
+module_init(eeti_ts_init);
+module_exit(eeti_ts_exit);
+
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c
index 948e167557f1..880f58c6a7c4 100644
--- a/drivers/input/touchscreen/tsc2007.c
+++ b/drivers/input/touchscreen/tsc2007.c
@@ -257,7 +257,7 @@ static int tsc2007_probe(struct i2c_client *client,
         struct input_dev *input_dev;
         int err;
 
-        if (!pdata) {
+        if (!pdata || !pdata->get_pendown_state) {
                 dev_err(&client->dev, "platform data is required!\n");
                 return -EINVAL;
         }
diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c
new file mode 100644
index 000000000000..6071f5882572
--- /dev/null
+++ b/drivers/input/touchscreen/w90p910_ts.c
@@ -0,0 +1,350 @@
+/*
+ * Copyright (c) 2008 Nuvoton technology corporation.
+ *
+ * Wan ZongShun <mcuos.com@gmail.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;version 2 of the License.
+ *
+ */
+
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+
+/* ADC controller bit defines */
+#define ADC_DELAY       0xf00
+#define ADC_DOWN        0x01
+#define ADC_TSC_Y       (0x01 << 8)
+#define ADC_TSC_X       (0x00 << 8)
+#define TSC_FOURWIRE    (~(0x03 << 1))
+#define ADC_CLK_EN      (0x01 << 28)    /* ADC clock enable */
+#define ADC_READ_CON    (0x01 << 12)
+#define ADC_CONV        (0x01 << 13)
+#define ADC_SEMIAUTO    (0x01 << 14)
+#define ADC_WAITTRIG    (0x03 << 14)
+#define ADC_RST1        (0x01 << 16)
+#define ADC_RST0        (0x00 << 16)
+#define ADC_EN          (0x01 << 17)
+#define ADC_INT         (0x01 << 18)
+#define WT_INT          (0x01 << 20)
+#define ADC_INT_EN      (0x01 << 21)
+#define LVD_INT_EN      (0x01 << 22)
+#define WT_INT_EN       (0x01 << 23)
+#define ADC_DIV         (0x04 << 1)     /* div = 6 */
+
+enum ts_state {
+        TS_WAIT_NEW_PACKET,     /* We are waiting next touch report */
+        TS_WAIT_X_COORD,        /* We are waiting for ADC to report X coord */
+        TS_WAIT_Y_COORD,        /* We are waiting for ADC to report Y coord */
+        TS_IDLE,                /* Input device is closed, don't do anything */
+};
+
+struct w90p910_ts {
+        struct input_dev *input;
+        struct timer_list timer;
+        int irq_num;
+        void __iomem *clocken;
+        void __iomem *ts_reg;
+        spinlock_t lock;
+        enum ts_state state;
+};
+
+static void w90p910_report_event(struct w90p910_ts *w90p910_ts, bool down)
+{
+        struct input_dev *dev = w90p910_ts->input;
+
+        if (down) {
+                input_report_abs(dev, ABS_X,
+                                 __raw_readl(w90p910_ts->ts_reg + 0x0c));
+                input_report_abs(dev, ABS_Y,
+                                 __raw_readl(w90p910_ts->ts_reg + 0x10));
+        }
+
+        input_report_key(dev, BTN_TOUCH, down);
+        input_sync(dev);
+}
+
+static void w90p910_prepare_x_reading(struct w90p910_ts *w90p910_ts)
+{
+        unsigned long ctlreg;
+
+        __raw_writel(ADC_TSC_X, w90p910_ts->ts_reg + 0x04);
+        ctlreg = __raw_readl(w90p910_ts->ts_reg);
+        ctlreg &= ~(ADC_WAITTRIG | WT_INT | WT_INT_EN);
+        ctlreg |= ADC_SEMIAUTO | ADC_INT_EN | ADC_CONV;
+        __raw_writel(ctlreg, w90p910_ts->ts_reg);
+
+        w90p910_ts->state = TS_WAIT_X_COORD;
+}
+
+static void w90p910_prepare_y_reading(struct w90p910_ts *w90p910_ts)
+{
+        unsigned long ctlreg;
+
+        __raw_writel(ADC_TSC_Y, w90p910_ts->ts_reg + 0x04);
+        ctlreg = __raw_readl(w90p910_ts->ts_reg);
+        ctlreg &= ~(ADC_WAITTRIG | ADC_INT | WT_INT_EN);
+        ctlreg |= ADC_SEMIAUTO | ADC_INT_EN | ADC_CONV;
+        __raw_writel(ctlreg, w90p910_ts->ts_reg);
+
+        w90p910_ts->state = TS_WAIT_Y_COORD;
+}
+
+static void w90p910_prepare_next_packet(struct w90p910_ts *w90p910_ts)
+{
+        unsigned long ctlreg;
+
+        ctlreg = __raw_readl(w90p910_ts->ts_reg);
+        ctlreg &= ~(ADC_INT | ADC_INT_EN | ADC_SEMIAUTO | ADC_CONV);
+        ctlreg |= ADC_WAITTRIG | WT_INT_EN;
+        __raw_writel(ctlreg, w90p910_ts->ts_reg);
+
+        w90p910_ts->state = TS_WAIT_NEW_PACKET;
+}
+
+static irqreturn_t w90p910_ts_interrupt(int irq, void *dev_id)
+{
+        struct w90p910_ts *w90p910_ts = dev_id;
+        unsigned long flags;
+
+        spin_lock_irqsave(&w90p910_ts->lock, flags);
+
+        switch (w90p910_ts->state) {
+        case TS_WAIT_NEW_PACKET:
+                /*
+                 * The controller only generates interrupts when pen
+                 * is down.
+                 */
+                del_timer(&w90p910_ts->timer);
+                w90p910_prepare_x_reading(w90p910_ts);
+                break;
+
+
+        case TS_WAIT_X_COORD:
+                w90p910_prepare_y_reading(w90p910_ts);
+                break;
+
+        case TS_WAIT_Y_COORD:
+                w90p910_report_event(w90p910_ts, true);
+                w90p910_prepare_next_packet(w90p910_ts);
+                mod_timer(&w90p910_ts->timer, jiffies + msecs_to_jiffies(100));
+                break;
+
+        case TS_IDLE:
+                break;
+        }
+
+        spin_unlock_irqrestore(&w90p910_ts->lock, flags);
+
+        return IRQ_HANDLED;
+}
+
+static void w90p910_check_pen_up(unsigned long data)
+{
+        struct w90p910_ts *w90p910_ts = (struct w90p910_ts *) data;
+        unsigned long flags;
+
+        spin_lock_irqsave(&w90p910_ts->lock, flags);
+
+        if (w90p910_ts->state == TS_WAIT_NEW_PACKET &&
+            !(__raw_readl(w90p910_ts->ts_reg + 0x04) & ADC_DOWN)) {
+
+                w90p910_report_event(w90p910_ts, false);
+        }
+
+        spin_unlock_irqrestore(&w90p910_ts->lock, flags);
+}
+
+static int w90p910_open(struct input_dev *dev)
+{
+        struct w90p910_ts *w90p910_ts = input_get_drvdata(dev);
+        unsigned long val;
+
+        /* enable the ADC clock */
+        val = __raw_readl(w90p910_ts->clocken);
+        __raw_writel(val | ADC_CLK_EN, w90p910_ts->clocken);
+
+        __raw_writel(ADC_RST1, w90p910_ts->ts_reg);
+        msleep(1);
+        __raw_writel(ADC_RST0, w90p910_ts->ts_reg);
+        msleep(1);
+
+        /* set delay and screen type */
+        val = __raw_readl(w90p910_ts->ts_reg + 0x04);
+        __raw_writel(val & TSC_FOURWIRE, w90p910_ts->ts_reg + 0x04);
+        __raw_writel(ADC_DELAY, w90p910_ts->ts_reg + 0x08);
+
+        w90p910_ts->state = TS_WAIT_NEW_PACKET;
+        wmb();
+
+        /* set trigger mode */
+        val = __raw_readl(w90p910_ts->ts_reg);
+        val |= ADC_WAITTRIG | ADC_DIV | ADC_EN | WT_INT_EN;
+        __raw_writel(val, w90p910_ts->ts_reg);
+
+        return 0;
+}
+
+static void w90p910_close(struct input_dev *dev)
+{
+        struct w90p910_ts *w90p910_ts = input_get_drvdata(dev);
+        unsigned long val;
+
+        /* disable trigger mode */
+
+        spin_lock_irq(&w90p910_ts->lock);
+
+        w90p910_ts->state = TS_IDLE;
+
+        val = __raw_readl(w90p910_ts->ts_reg);
+        val &= ~(ADC_WAITTRIG | ADC_DIV | ADC_EN | WT_INT_EN | ADC_INT_EN);
+        __raw_writel(val, w90p910_ts->ts_reg);
+
+        spin_unlock_irq(&w90p910_ts->lock);
+
+        /* Now that interrupts are shut off we can safely delete timer */
+        del_timer_sync(&w90p910_ts->timer);
+
+        /* stop the ADC clock */
+        val = __raw_readl(w90p910_ts->clocken);
+        __raw_writel(val & ~ADC_CLK_EN, w90p910_ts->clocken);
+}
+
+static int __devinit w90x900ts_probe(struct platform_device *pdev)
+{
+        struct w90p910_ts *w90p910_ts;
+        struct input_dev *input_dev;
+        struct resource *res;
+        int err;
+
+        w90p910_ts = kzalloc(sizeof(struct w90p910_ts), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!w90p910_ts || !input_dev) {
+                err = -ENOMEM;
+                goto fail1;
+        }
+
+        w90p910_ts->input = input_dev;
+        w90p910_ts->state = TS_IDLE;
+        spin_lock_init(&w90p910_ts->lock);
+        setup_timer(&w90p910_ts->timer, w90p910_check_pen_up,
+                    (unsigned long)&w90p910_ts);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                err = -ENXIO;
+                goto fail1;
+        }
+
+        if (!request_mem_region(res->start, res->end - res->start + 1,
+                                pdev->name)) {
+                err = -EBUSY;
+                goto fail1;
+        }
+
+        w90p910_ts->ts_reg = ioremap(res->start, res->end - res->start + 1);
+        if (!w90p910_ts->ts_reg) {
+                err = -ENOMEM;
+                goto fail2;
+        }
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        if (!res) {
+                err = -ENXIO;
+                goto fail3;
+        }
+
+        w90p910_ts->clocken = (void __iomem *)res->start;
+
+        input_dev->name = "W90P910 TouchScreen";
+        input_dev->phys = "w90p910ts/event0";
+        input_dev->id.bustype = BUS_HOST;
+        input_dev->id.vendor  = 0x0005;
+        input_dev->id.product = 0x0001;
+        input_dev->id.version = 0x0100;
+        input_dev->dev.parent = &pdev->dev;
+        input_dev->open = w90p910_open;
+        input_dev->close = w90p910_close;
+
+        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, 0x400, 0, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, 0x400, 0, 0);
+
+        input_set_drvdata(input_dev, w90p910_ts);
+
+        w90p910_ts->irq_num = platform_get_irq(pdev, 0);
+        if (request_irq(w90p910_ts->irq_num, w90p910_ts_interrupt,
+                        IRQF_DISABLED, "w90p910ts", w90p910_ts)) {
+                err = -EBUSY;
+                goto fail3;
+        }
+
+        err = input_register_device(w90p910_ts->input);
+        if (err)
+                goto fail4;
+
+        platform_set_drvdata(pdev, w90p910_ts);
+
+        return 0;
+
+fail4:  free_irq(w90p910_ts->irq_num, w90p910_ts);
+fail3:  iounmap(w90p910_ts->ts_reg);
+fail2:  release_mem_region(res->start, res->end - res->start + 1);
+fail1:  input_free_device(input_dev);
+        kfree(w90p910_ts);
+        return err;
+}
+
+static int __devexit w90x900ts_remove(struct platform_device *pdev)
+{
+        struct w90p910_ts *w90p910_ts = platform_get_drvdata(pdev);
+        struct resource *res;
+
+        free_irq(w90p910_ts->irq_num, w90p910_ts);
+        del_timer_sync(&w90p910_ts->timer);
+        iounmap(w90p910_ts->ts_reg);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(res->start, res->end - res->start + 1);
+
+        input_unregister_device(w90p910_ts->input);
+        kfree(w90p910_ts);
+
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+static struct platform_driver w90x900ts_driver = {
+        .probe          = w90x900ts_probe,
+        .remove         = __devexit_p(w90x900ts_remove),
+        .driver         = {
+                .name   = "w90x900-ts",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init w90x900ts_init(void)
+{
+        return platform_driver_register(&w90x900ts_driver);
+}
+
+static void __exit w90x900ts_exit(void)
+{
+        platform_driver_unregister(&w90x900ts_driver);
+}
+
+module_init(w90x900ts_init);
+module_exit(w90x900ts_exit);
+
+MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
+MODULE_DESCRIPTION("w90p910 touch screen driver!");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:w90p910-ts");