- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix.

[linux-flexiantxendom0-3.2.10.git] / drivers / input / touchscreen / ads7846.c

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 0a26e06..1c9069c 100644 (file)
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -39,7 +39,9 @@
 /*
  * 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.
+ * TSC2046 is just newer ads7846 silicon.
+ * 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 +248,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 +536,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
@@ -845,7 +848,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
         * may not.  So we stick to very-portable 8 bit words, both RX and TX.
         */
        spi->bits_per_word = 8;
-       spi->mode = SPI_MODE_1;
+       spi->mode = SPI_MODE_0;
        err = spi_setup(spi);
        if (err < 0)
                return err;
@@ -897,7 +900,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);