Commit 879f2fea authored by Andrey Gelman's avatar Andrey Gelman Committed by Dmitry Torokhov

Input: ads7846 - correct the value got from SPI

According to the touch controller spec, SPI return a 16 bit value, only 12
bits are valid, they are bit[14-3].

The value of MISO and MOSI can be configured when SPI is in idle mode.
Currently this touch driver assumes the SPI bus sets the MOSI and MISO in
low level when SPI bus is in idle mode. So the bit[15] of the value got
from SPI bus is always 0. But when SPI bus congfigures the MOSI and MISO in
high level during the SPI idle mode, the bit[15] of the value get from SPI
is always 1. If bit[15] is not masked, we may get the wrong value.

Mask the invalid bit to make sure the correct value gets returned.
Regardless of the SPI bus idle configuration.
Signed-off-by: default avatarAndrey Gelman <andrey.gelman@compulab.co.il>
Signed-off-by: default avatarHaibo Chen <haibo.chen@freescale.com>
Signed-off-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 62d78461
...@@ -668,18 +668,22 @@ static int ads7846_no_filter(void *ads, int data_idx, int *val) ...@@ -668,18 +668,22 @@ static int ads7846_no_filter(void *ads, int data_idx, int *val)
static int ads7846_get_value(struct ads7846 *ts, struct spi_message *m) static int ads7846_get_value(struct ads7846 *ts, struct spi_message *m)
{ {
int value;
struct spi_transfer *t = struct spi_transfer *t =
list_entry(m->transfers.prev, struct spi_transfer, transfer_list); list_entry(m->transfers.prev, struct spi_transfer, transfer_list);
if (ts->model == 7845) { if (ts->model == 7845) {
return be16_to_cpup((__be16 *)&(((char*)t->rx_buf)[1])) >> 3; value = be16_to_cpup((__be16 *)&(((char *)t->rx_buf)[1]));
} else { } else {
/* /*
* adjust: on-wire is a must-ignore bit, a BE12 value, then * adjust: on-wire is a must-ignore bit, a BE12 value, then
* padding; built from two 8 bit values written msb-first. * padding; built from two 8 bit values written msb-first.
*/ */
return be16_to_cpup((__be16 *)t->rx_buf) >> 3; value = be16_to_cpup((__be16 *)t->rx_buf);
} }
/* enforce ADC output is 12 bits width */
return (value >> 3) & 0xfff;
} }
static void ads7846_update_value(struct spi_message *m, int val) static void ads7846_update_value(struct spi_message *m, int val)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment