Skip to content

Commit

Permalink
Input: ads7846 - support swapping x and y axes
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Roth <mroth@nessie.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Michael Roth authored and Dmitry Torokhov committed May 20, 2009
1 parent 225c988 commit 86579a4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/input/touchscreen/ads7846.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions include/linux/spi/ads7846.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 86579a4

Please sign in to comment.