Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (32 commits)
  Input: wm97xx - update email address for Liam Girdwood
  Input: i8042 - add Thinkpad R31 to nomux list
  Input: move map_to_7segment.h to include/linux
  Input: ads7846 - fix cache line sharing issue
  Input: cm109 - add missing newlines to messages
  Input: document i8042.debug in kernel-parameters.txt
  Input: keyboard - fix potential out of bound access to key_map
  Input: psmouse - add OLPC touchpad driver
  Input: psmouse - tweak PSMOUSE_DEFINE_ATTR to support raw set callbacks
  Input: psmouse - add psmouse_queue_work() for ps/2 extension to make use of
  Input: psmouse - export psmouse_set_state for ps/2 extensions to use
  Input: ads7846 - introduce .gpio_pendown to get pendown state
  Input: ALPS - add signature for DualPoint found in Dell Latitude E6500
  Input: serio_raw - allow attaching to translated (SERIO_I8042XL) ports
  Input: cm109 - don't use obsolete logging macros
  Input: atkbd - expand Latitude's force release quirk to other Dells
  Input: bf54x-keys - add power management support
  Input: atmel_tsadcc - improve accuracy
  Input: convert drivers to use strict_strtoul()
  Input: appletouch - handle geyser 3/4 status bits
  ...

1 files changed, 55 insertions, 39 deletions

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 8583c766d565..b9b7fc6ff1eb 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -69,6 +69,17 @@ struct ts_event {
         int     ignore;
 };
 
+/*
+ * We allocate this separately to avoid cache line sharing issues when
+ * driver is used with DMA-based SPI controllers (like atmel_spi) on
+ * systems where main memory is not DMA-coherent (most non-x86 boards).
+ */
+struct ads7846_packet {
+        u8                      read_x, read_y, read_z1, read_z2, pwrdown;
+        u16                     dummy;          /* for the pwrdown read */
+        struct ts_event         tc;
+};
+
 struct ads7846 {
         struct input_dev        *input;
         char                    phys[32];
@@ -86,9 +97,7 @@ struct ads7846 {
         u16                     x_plate_ohms;
         u16                     pressure_max;
 
-        u8                      read_x, read_y, read_z1, read_z2, pwrdown;
-        u16                     dummy;          /* for the pwrdown read */
-        struct ts_event         tc;
+        struct ads7846_packet   *packet;
 
         struct spi_transfer     xfer[18];
         struct spi_message      msg[5];
@@ -463,10 +472,11 @@ static ssize_t ads7846_disable_store(struct device *dev,
                                      const char *buf, size_t count)
 {
         struct ads7846 *ts = dev_get_drvdata(dev);
-        char *endp;
-        int i;
+        long i;
+
+        if (strict_strtoul(buf, 10, &i))
+                return -EINVAL;
 
-        i = simple_strtoul(buf, &endp, 10);
         spin_lock_irq(&ts->lock);
 
         if (i)
@@ -512,16 +522,17 @@ static int get_pendown_state(struct ads7846 *ts)
 static void ads7846_rx(void *ads)
 {
         struct ads7846          *ts = ads;
+        struct ads7846_packet   *packet = ts->packet;
         unsigned                Rt;
         u16                     x, y, z1, z2;
 
         /* ads7846_rx_val() did in-place conversion (including byteswap) from
          * on-the-wire format as part of debouncing to get stable readings.
          */
-        x = ts->tc.x;
-        y = ts->tc.y;
-        z1 = ts->tc.z1;
-        z2 = ts->tc.z2;
+        x = packet->tc.x;
+        y = packet->tc.y;
+        z1 = packet->tc.z1;
+        z2 = packet->tc.z2;
 
         /* range filtering */
         if (x == MAX_12BIT)
@@ -545,10 +556,10 @@ static void ads7846_rx(void *ads)
          * the maximum. Don't report it to user space, repeat at least
          * once more the measurement
          */
-        if (ts->tc.ignore || Rt > ts->pressure_max) {
+        if (packet->tc.ignore || Rt > ts->pressure_max) {
 #ifdef VERBOSE
                 pr_debug("%s: ignored %d pressure %d\n",
-                        ts->spi->dev.bus_id, ts->tc.ignore, Rt);
+                        ts->spi->dev.bus_id, packet->tc.ignore, Rt);
 #endif
                 hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_PERIOD),
                               HRTIMER_MODE_REL);
@@ -641,6 +652,7 @@ static int ads7846_no_filter(void *ads, int data_idx, int *val)
 static void ads7846_rx_val(void *ads)
 {
         struct ads7846 *ts = ads;
+        struct ads7846_packet *packet = ts->packet;
         struct spi_message *m;
         struct spi_transfer *t;
         int val;
@@ -660,7 +672,7 @@ static void ads7846_rx_val(void *ads)
         case ADS7846_FILTER_REPEAT:
                 break;
         case ADS7846_FILTER_IGNORE:
-                ts->tc.ignore = 1;
+                packet->tc.ignore = 1;
                 /* Last message will contain ads7846_rx() as the
                  * completion function.
                  */
@@ -668,7 +680,7 @@ static void ads7846_rx_val(void *ads)
                 break;
         case ADS7846_FILTER_OK:
                 *(u16 *)t->rx_buf = val;
-                ts->tc.ignore = 0;
+                packet->tc.ignore = 0;
                 m = &ts->msg[++ts->msg_idx];
                 break;
         default:
@@ -773,7 +785,6 @@ static void ads7846_disable(struct ads7846 *ts)
         /* we know the chip's in lowpower mode since we always
          * leave it that way after every request
          */
-
 }
 
 /* Must be called with ts->lock held */
@@ -849,6 +860,7 @@ static int __devinit setup_pendown(struct spi_device *spi, struct ads7846 *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;
         struct spi_message              *m;
@@ -884,14 +896,16 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 return err;
 
         ts = kzalloc(sizeof(struct ads7846), GFP_KERNEL);
+        packet = kzalloc(sizeof(struct ads7846_packet), GFP_KERNEL);
         input_dev = input_allocate_device();
-        if (!ts || !input_dev) {
+        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;
@@ -963,13 +977,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)
         spi_message_init(m);
 
         /* y- still on; turn on only y+ (and ADC) */
-        ts->read_y = READ_Y(vref);
-        x->tx_buf = &ts->read_y;
+        packet->read_y = READ_Y(vref);
+        x->tx_buf = &packet->read_y;
         x->len = 1;
         spi_message_add_tail(x, m);
 
         x++;
-        x->rx_buf = &ts->tc.y;
+        x->rx_buf = &packet->tc.y;
         x->len = 2;
         spi_message_add_tail(x, m);
 
@@ -981,12 +995,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 x->delay_usecs = pdata->settle_delay_usecs;
 
                 x++;
-                x->tx_buf = &ts->read_y;
+                x->tx_buf = &packet->read_y;
                 x->len = 1;
                 spi_message_add_tail(x, m);
 
                 x++;
-                x->rx_buf = &ts->tc.y;
+                x->rx_buf = &packet->tc.y;
                 x->len = 2;
                 spi_message_add_tail(x, m);
         }
@@ -999,13 +1013,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 
         /* turn y- off, x+ on, then leave in lowpower */
         x++;
-        ts->read_x = READ_X(vref);
-        x->tx_buf = &ts->read_x;
+        packet->read_x = READ_X(vref);
+        x->tx_buf = &packet->read_x;
         x->len = 1;
         spi_message_add_tail(x, m);
 
         x++;
-        x->rx_buf = &ts->tc.x;
+        x->rx_buf = &packet->tc.x;
         x->len = 2;
         spi_message_add_tail(x, m);
 
@@ -1014,12 +1028,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 x->delay_usecs = pdata->settle_delay_usecs;
 
                 x++;
-                x->tx_buf = &ts->read_x;
+                x->tx_buf = &packet->read_x;
                 x->len = 1;
                 spi_message_add_tail(x, m);
 
                 x++;
-                x->rx_buf = &ts->tc.x;
+                x->rx_buf = &packet->tc.x;
                 x->len = 2;
                 spi_message_add_tail(x, m);
         }
@@ -1033,13 +1047,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 spi_message_init(m);
 
                 x++;
-                ts->read_z1 = READ_Z1(vref);
-                x->tx_buf = &ts->read_z1;
+                packet->read_z1 = READ_Z1(vref);
+                x->tx_buf = &packet->read_z1;
                 x->len = 1;
                 spi_message_add_tail(x, m);
 
                 x++;
-                x->rx_buf = &ts->tc.z1;
+                x->rx_buf = &packet->tc.z1;
                 x->len = 2;
                 spi_message_add_tail(x, m);
 
@@ -1048,12 +1062,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                         x->delay_usecs = pdata->settle_delay_usecs;
 
                         x++;
-                        x->tx_buf = &ts->read_z1;
+                        x->tx_buf = &packet->read_z1;
                         x->len = 1;
                         spi_message_add_tail(x, m);
 
                         x++;
-                        x->rx_buf = &ts->tc.z1;
+                        x->rx_buf = &packet->tc.z1;
                         x->len = 2;
                         spi_message_add_tail(x, m);
                 }
@@ -1065,13 +1079,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 spi_message_init(m);
 
                 x++;
-                ts->read_z2 = READ_Z2(vref);
-                x->tx_buf = &ts->read_z2;
+                packet->read_z2 = READ_Z2(vref);
+                x->tx_buf = &packet->read_z2;
                 x->len = 1;
                 spi_message_add_tail(x, m);
 
                 x++;
-                x->rx_buf = &ts->tc.z2;
+                x->rx_buf = &packet->tc.z2;
                 x->len = 2;
                 spi_message_add_tail(x, m);
 
@@ -1080,12 +1094,12 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                         x->delay_usecs = pdata->settle_delay_usecs;
 
                         x++;
-                        x->tx_buf = &ts->read_z2;
+                        x->tx_buf = &packet->read_z2;
                         x->len = 1;
                         spi_message_add_tail(x, m);
 
                         x++;
-                        x->rx_buf = &ts->tc.z2;
+                        x->rx_buf = &packet->tc.z2;
                         x->len = 2;
                         spi_message_add_tail(x, m);
                 }
@@ -1099,13 +1113,13 @@ static int __devinit ads7846_probe(struct spi_device *spi)
         spi_message_init(m);
 
         x++;
-        ts->pwrdown = PWRDOWN;
-        x->tx_buf = &ts->pwrdown;
+        packet->pwrdown = PWRDOWN;
+        x->tx_buf = &packet->pwrdown;
         x->len = 1;
         spi_message_add_tail(x, m);
 
         x++;
-        x->rx_buf = &ts->dummy;
+        x->rx_buf = &packet->dummy;
         x->len = 2;
         CS_CHANGE(*x);
         spi_message_add_tail(x, m);
@@ -1158,6 +1172,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 ts->filter_cleanup(ts->filter_data);
  err_free_mem:
         input_free_device(input_dev);
+        kfree(packet);
         kfree(ts);
         return err;
 }
@@ -1183,6 +1198,7 @@ static int __devexit ads7846_remove(struct spi_device *spi)
         if (ts->filter_cleanup)
                 ts->filter_cleanup(ts->filter_data);
 
+        kfree(ts->packet);
         kfree(ts);
 
         dev_dbg(&spi->dev, "unregistered touchscreen\n");