From: Daniel Ribeiro Date: Wed, 17 Jun 2009 23:26:06 +0000 (-0700) Subject: pxa2xx_spi: fix for SPI_CS_HIGH X-Git-Tag: v2.6.31-rc1~264 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50e0a7bd02f95be95ac03299b0356ba6400d1c6d;p=platform%2Fkernel%2Flinux-3.10.git 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 Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- 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;