10 files changed, 47 insertions, 35 deletions

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 0a26e0663542..693e3b2a65a3 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -39,7 +39,8 @@
 /*
  * This code has been heavily tested on a Nokia 770, and lightly
  * tested on other ads7846 devices (OSK/Mistral, Lubbock).
- * Support for ads7843 and ads7845 has only been stubbed in.
+ * Support for ads7843 tested on Atmel at91sam926x-EK.
+ * Support for ads7845 has only been stubbed in.
  *
  * IRQ handling needs a workaround because of a shortcoming in handling
  * edge triggered IRQs on some platforms like the OMAP1/2. These
@@ -246,18 +247,16 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
 
         /* REVISIT:  take a few more samples, and compare ... */
 
-        /* maybe off internal vREF */
-        if (use_internal) {
-                req->ref_off = REF_OFF;
-                req->xfer[4].tx_buf = &req->ref_off;
-                req->xfer[4].len = 1;
-                spi_message_add_tail(&req->xfer[4], &req->msg);
-
-                req->xfer[5].rx_buf = &req->scratch;
-                req->xfer[5].len = 2;
-                CS_CHANGE(req->xfer[5]);
-                spi_message_add_tail(&req->xfer[5], &req->msg);
-        }
+        /* converter in low power mode & enable PENIRQ */
+        req->ref_off = PWRDOWN;
+        req->xfer[4].tx_buf = &req->ref_off;
+        req->xfer[4].len = 1;
+        spi_message_add_tail(&req->xfer[4], &req->msg);
+
+        req->xfer[5].rx_buf = &req->scratch;
+        req->xfer[5].len = 2;
+        CS_CHANGE(req->xfer[5]);
+        spi_message_add_tail(&req->xfer[5], &req->msg);
 
         ts->irq_disabled = 1;
         disable_irq(spi->irq);
@@ -536,6 +535,9 @@ static void ads7846_rx(void *ads)
         } else
                 Rt = 0;
 
+        if (ts->model == 7843)
+                Rt = ts->pressure_max / 2;
+
         /* 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
@@ -897,7 +899,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 
         input_dev->name = "ADS784x Touchscreen";
         input_dev->phys = ts->phys;
-        input_dev->cdev.dev = &spi->dev;
+        input_dev->dev.parent = &spi->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index e2945582828e..e6a31d118786 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -300,8 +300,7 @@ static int __init corgits_probe(struct platform_device *pdev)
         input_dev->id.vendor = 0x0001;
         input_dev->id.product = 0x0002;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &pdev->dev;
-        input_dev->private = corgi_ts;
+        input_dev->dev.parent = &pdev->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c
index 9d61cd133d01..557d781719f1 100644
--- a/drivers/input/touchscreen/elo.c
+++ b/drivers/input/touchscreen/elo.c
@@ -312,14 +312,13 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv)
         init_completion(&elo->cmd_done);
         snprintf(elo->phys, sizeof(elo->phys), "%s/input0", serio->phys);
 
-        input_dev->private = elo;
         input_dev->name = "Elo Serial TouchScreen";
         input_dev->phys = elo->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->id.vendor = SERIO_ELO;
         input_dev->id.product = elo->id;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
diff --git a/drivers/input/touchscreen/gunze.c b/drivers/input/touchscreen/gunze.c
index 9157eb148e84..39d602600d7c 100644
--- a/drivers/input/touchscreen/gunze.c
+++ b/drivers/input/touchscreen/gunze.c
@@ -130,13 +130,13 @@ static int gunze_connect(struct serio *serio, struct serio_driver *drv)
         gunze->dev = input_dev;
         snprintf(gunze->phys, sizeof(serio->phys), "%s/input0", serio->phys);
 
-        input_dev->private = gunze;
         input_dev->name = "Gunze AHL-51S TouchScreen";
         input_dev->phys = gunze->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->id.vendor = SERIO_GUNZE;
         input_dev->id.product = 0x0051;
         input_dev->id.version = 0x0100;
+        input_dev->dev.parent = &serio->dev;
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
         input_set_abs_params(input_dev, ABS_X, 24, 1000, 0, 0);
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
index c4116d4f64e7..09ed7803cb8f 100644
--- a/drivers/input/touchscreen/h3600_ts_input.c
+++ b/drivers/input/touchscreen/h3600_ts_input.c
@@ -147,7 +147,7 @@ enum flite_pwr {
 unsigned int h3600_flite_power(struct input_dev *dev, enum flite_pwr pwr)
 {
         unsigned char brightness = (pwr == FLITE_PWR_OFF) ? 0 : flite_brightness;
-        struct h3600_dev *ts = dev->private;
+        struct h3600_dev *ts = input_get_drvdata(dev);
 
         /* Must be in this order */
         ts->serio->write(ts->serio, 1);
@@ -260,7 +260,7 @@ static int h3600ts_event(struct input_dev *dev, unsigned int type,
                          unsigned int code, int value)
 {
 #if 0
-        struct h3600_dev *ts = dev->private;
+        struct h3600_dev *ts = input_get_drvdata(dev);
 
         switch (type) {
                 case EV_LED: {
@@ -367,8 +367,9 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor = SERIO_H3600;
         input_dev->id.product = 0x0666;  /* FIXME !!! We can ask the hardware */
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
-        input_dev->private = ts;
+        input_dev->dev.parent = &serio->dev;
+
+        input_set_drvdata(input_dev, ts);
 
         input_dev->event = h3600ts_event;
 
diff --git a/drivers/input/touchscreen/mtouch.c b/drivers/input/touchscreen/mtouch.c
index c3c2d735d0ec..4ec3b1f940c8 100644
--- a/drivers/input/touchscreen/mtouch.c
+++ b/drivers/input/touchscreen/mtouch.c
@@ -144,13 +144,13 @@ static int mtouch_connect(struct serio *serio, struct serio_driver *drv)
         mtouch->dev = input_dev;
         snprintf(mtouch->phys, sizeof(mtouch->phys), "%s/input0", serio->phys);
 
-        input_dev->private = mtouch;
         input_dev->name = "MicroTouch Serial TouchScreen";
         input_dev->phys = mtouch->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->id.vendor = SERIO_MICROTOUCH;
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
+        input_dev->dev.parent = &serio->dev;
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
         input_set_abs_params(mtouch->dev, ABS_X, MTOUCH_MIN_XC, MTOUCH_MAX_XC, 0, 0);
diff --git a/drivers/input/touchscreen/penmount.c b/drivers/input/touchscreen/penmount.c
index bd2767991ae9..f2c0d3c7149c 100644
--- a/drivers/input/touchscreen/penmount.c
+++ b/drivers/input/touchscreen/penmount.c
@@ -105,14 +105,13 @@ static int pm_connect(struct serio *serio, struct serio_driver *drv)
         pm->dev = input_dev;
         snprintf(pm->phys, sizeof(pm->phys), "%s/input0", serio->phys);
 
-        input_dev->private = pm;
         input_dev->name = "Penmount Serial TouchScreen";
         input_dev->phys = pm->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->id.vendor = SERIO_PENMOUNT;
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = &serio->dev;
+        input_dev->dev.parent = &serio->dev;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
diff --git a/drivers/input/touchscreen/touchright.c b/drivers/input/touchscreen/touchright.c
index 35ba46c6ad2d..3def7bb1df44 100644
--- a/drivers/input/touchscreen/touchright.c
+++ b/drivers/input/touchscreen/touchright.c
@@ -118,13 +118,13 @@ static int tr_connect(struct serio *serio, struct serio_driver *drv)
         tr->dev = input_dev;
         snprintf(tr->phys, sizeof(tr->phys), "%s/input0", serio->phys);
 
-        input_dev->private = tr;
         input_dev->name = "Touchright Serial TouchScreen";
         input_dev->phys = tr->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->id.vendor = SERIO_TOUCHRIGHT;
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
+        input_dev->dev.parent = &serio->dev;
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
         input_set_abs_params(tr->dev, ABS_X, TR_MIN_XC, TR_MAX_XC, 0, 0);
diff --git a/drivers/input/touchscreen/touchwin.c b/drivers/input/touchscreen/touchwin.c
index 4dc073dacabb..ac4bdcf18666 100644
--- a/drivers/input/touchscreen/touchwin.c
+++ b/drivers/input/touchscreen/touchwin.c
@@ -125,13 +125,13 @@ static int tw_connect(struct serio *serio, struct serio_driver *drv)
         tw->dev = input_dev;
         snprintf(tw->phys, sizeof(tw->phys), "%s/input0", serio->phys);
 
-        input_dev->private = tw;
         input_dev->name = "Touchwindow Serial TouchScreen";
         input_dev->phys = tw->phys;
         input_dev->id.bustype = BUS_RS232;
         input_dev->id.vendor = SERIO_TOUCHWIN;
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
+        input_dev->dev.parent = &serio->dev;
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
         input_set_abs_params(tw->dev, ABS_X, TW_MIN_XC, TW_MAX_XC, 0, 0);
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index e8606c48c9c3..6582816a0477 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -97,6 +97,8 @@ struct ucb1400 {
 };
 
 static int adcsync;
+static int ts_delay = 55; /* us */
+static int ts_delay_pressure;   /* us */
 
 static inline u16 ucb1400_reg_read(struct ucb1400 *ucb, u16 reg)
 {
@@ -159,6 +161,7 @@ static inline unsigned int ucb1400_ts_read_pressure(struct ucb1400 *ucb)
                         UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW |
                         UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_GND |
                         UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
+        udelay(ts_delay_pressure);
         return ucb1400_adc_read(ucb, UCB_ADC_INP_TSPY);
 }
 
@@ -180,7 +183,7 @@ static inline unsigned int ucb1400_ts_read_xpos(struct ucb1400 *ucb)
                         UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |
                         UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
 
-        udelay(55);
+        udelay(ts_delay);
 
         return ucb1400_adc_read(ucb, UCB_ADC_INP_TSPY);
 }
@@ -203,7 +206,7 @@ static inline unsigned int ucb1400_ts_read_ypos(struct ucb1400 *ucb)
                         UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |
                         UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
 
-        udelay(55);
+        udelay(ts_delay);
 
         return ucb1400_adc_read(ucb, UCB_ADC_INP_TSPX);
 }
@@ -369,7 +372,7 @@ static irqreturn_t ucb1400_hard_irq(int irqnr, void *devid)
 
 static int ucb1400_ts_open(struct input_dev *idev)
 {
-        struct ucb1400 *ucb = idev->private;
+        struct ucb1400 *ucb = input_get_drvdata(idev);
         int ret = 0;
 
         BUG_ON(ucb->ts_task);
@@ -385,7 +388,7 @@ static int ucb1400_ts_open(struct input_dev *idev)
 
 static void ucb1400_ts_close(struct input_dev *idev)
 {
-        struct ucb1400 *ucb = idev->private;
+        struct ucb1400 *ucb = input_get_drvdata(idev);
 
         if (ucb->ts_task)
                 kthread_stop(ucb->ts_task);
@@ -507,8 +510,9 @@ static int ucb1400_ts_probe(struct device *dev)
         }
         printk(KERN_DEBUG "UCB1400: found IRQ %d\n", ucb->irq);
 
-        idev->private           = ucb;
-        idev->cdev.dev          = dev;
+        input_set_drvdata(idev, ucb);
+
+        idev->dev.parent        = dev;
         idev->name              = "UCB1400 touchscreen interface";
         idev->id.vendor         = ucb1400_reg_read(ucb, AC97_VENDOR_ID1);
         idev->id.product        = id;
@@ -571,7 +575,15 @@ static void __exit ucb1400_ts_exit(void)
         driver_unregister(&ucb1400_ts_driver);
 }
 
-module_param(adcsync, int, 0444);
+module_param(adcsync, bool, 0444);
+MODULE_PARM_DESC(adcsync, "Synchronize touch readings with ADCSYNC pin.");
+
+module_param(ts_delay, int, 0444);
+MODULE_PARM_DESC(ts_delay, "Delay between panel setup and position read. Default = 55us.");
+
+module_param(ts_delay_pressure, int, 0444);
+MODULE_PARM_DESC(ts_delay_pressure,
+                  "delay between panel setup and pressure read.  Default = 0us.");
 
 module_init(ucb1400_ts_init);
 module_exit(ucb1400_ts_exit);