Input: ads7846 - support swapping x and y axes

Signed-off-by: Michael Roth <mroth@nessie.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 2b01e56568f8c023097c62c4185090c0587e91d1..b5ad252f5cf1f038269892a0388341b5374cef07 100644 (file)
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -97,6 +97,8 @@ struct ads7846 {
        u16                     x_plate_ohms;
        u16                     pressure_max;
 
+       bool                    swap_xy;
+
        struct ads7846_packet   *packet;
 
        struct spi_transfer     xfer[18];
@@ -599,6 +601,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 +923,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;

diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h
index 2ea20320c09399e37d9a3bf3de19c7d72106ef0e..51948eb6927ad218c53fdec36f9afedc91bc8cb9 100644 (file)
--- a/include/linux/spi/ads7846.h
+++ b/include/linux/spi/ads7846.h
@@ -17,6 +17,7 @@ struct ads7846_platform_data {
        u16     vref_mv;                /* external vref value, milliVolts */
        bool    keep_vref_on;           /* set to keep vref on for differential
                                         * measurements as well */
+       bool    swap_xy;                /* swap x and y axes */
 
        /* Settling time of the analog signals; a function of Vcc and the
         * capacitance on the X/Y drivers.  If set to non-zero, two samples