summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorDaniel Ribeiro <drwyrm@gmail.com>2009-06-17 16:26:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-18 13:03:42 -0700
commit50e0a7bd02f95be95ac03299b0356ba6400d1c6d (patch)
tree440323879441121d37daf80361f4ec5cc8fdc24f /drivers/spi
parent7390284290b184a7f4bb648ca15dc62c3dea3e75 (diff)
downloadop-kernel-dev-50e0a7bd02f95be95ac03299b0356ba6400d1c6d.zip
op-kernel-dev-50e0a7bd02f95be95ac03299b0356ba6400d1c6d.tar.gz
pxa2xx_spi: fix for SPI_CS_HIGH
Commit a7bb3909b3293d503211d7f6af8ed62c1644b686 ("spi: pxa2xx_spi: introduce chipselect GPIO to simplify the common cases") introduces chipselect GPIO, and configures the CS polarity using SPI_CS_HIGH spi->mode flag. Add SPI_CS_HIGH to the allowed modes. Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/pxa2xx_spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 9c311dc..d949dbf 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1485,7 +1485,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
drv_data->ssp = ssp;
/* the spi->mode bits understood by this driver: */
- master->mode_bits = SPI_CPOL | SPI_CPHA;
+ master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
master->bus_num = pdev->id;
master->num_chipselect = platform_info->num_chipselect;
OpenPOWER on IntegriCloud