summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorOskar Schirmer <os@emlix.com>2010-06-08 01:12:22 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-06-08 01:13:05 -0700
commitcd9b6fdf798841eb15253f928e762eee5260d347 (patch)
treed506d940ee70068c116ab0d1b127e8709c6776fe /drivers/input
parent0b75f775288b90a83a8708a5af663a03d4bbc9ce (diff)
downloadlinux-3.10-cd9b6fdf798841eb15253f928e762eee5260d347.tar.gz
linux-3.10-cd9b6fdf798841eb15253f928e762eee5260d347.tar.bz2
linux-3.10-cd9b6fdf798841eb15253f928e762eee5260d347.zip
Input: ad7877 - fix spi word size to 16 bit
With no word size given in the users platform data, a generic spi host controller driver will assume a default word size of eight bit. This causes transmission to be performed bytewise, which will fail on little endian machines for sure. Failure on big endian depends on usage of slave select to mark word boundaries. Anyway, ad7877 is specified to work with 16 bit per word, so unconditionally set the word size accordingly. Flag an error where 16 bit per word is not available. Signed-off-by: Oskar Schirmer <os@emlix.com> Signed-off-by: Daniel Glöckner <dg@emlix.com> Signed-off-by: Oliver Schneidewind <osw@emlix.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/ad7877.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c
index 0d2d7e54b46..5f0221cffef 100644
--- a/drivers/input/touchscreen/ad7877.c
+++ b/drivers/input/touchscreen/ad7877.c
@@ -679,6 +679,13 @@ static int __devinit ad7877_probe(struct spi_device *spi)
return -EINVAL;
}
+ spi->bits_per_word = 16;
+ err = spi_setup(spi);
+ if (err) {
+ dev_dbg(&spi->dev, "spi master doesn't support 16 bits/word\n");
+ return err;
+ }
+
ts = kzalloc(sizeof(struct ad7877), GFP_KERNEL);
input_dev = input_allocate_device();
if (!ts || !input_dev) {