mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
spi: spi-davinci: Add support for SPI_CS_WORD
This adds support for the SPI_CS_WORD flag to the TI DaVinci SPI driver. This mode can be used as long as we are using the hardware chip select and not a GPIO chip select. Signed-off-by: David Lechner <david@lechnology.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
9263696677
commit
a3762b13a5
1 changed files with 8 additions and 3 deletions
|
@ -230,7 +230,8 @@ static void davinci_spi_chipselect(struct spi_device *spi, int value)
|
|||
!(spi->mode & SPI_CS_HIGH));
|
||||
} else {
|
||||
if (value == BITBANG_CS_ACTIVE) {
|
||||
spidat1 |= SPIDAT1_CSHOLD_MASK;
|
||||
if (!(spi->mode & SPI_CS_WORD))
|
||||
spidat1 |= SPIDAT1_CSHOLD_MASK;
|
||||
spidat1 &= ~(0x1 << chip_sel);
|
||||
}
|
||||
}
|
||||
|
@ -438,8 +439,12 @@ static int davinci_spi_setup(struct spi_device *spi)
|
|||
return retval;
|
||||
}
|
||||
|
||||
if (internal_cs)
|
||||
if (internal_cs) {
|
||||
set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select);
|
||||
} else if (spi->mode & SPI_CS_WORD) {
|
||||
dev_err(&spi->dev, "SPI_CS_WORD can't be use with GPIO CS\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
if (spi->mode & SPI_READY)
|
||||
|
@ -974,7 +979,7 @@ static int davinci_spi_probe(struct platform_device *pdev)
|
|||
dspi->prescaler_limit = pdata->prescaler_limit;
|
||||
dspi->version = pdata->version;
|
||||
|
||||
dspi->bitbang.flags = SPI_NO_CS | SPI_LSB_FIRST | SPI_LOOP;
|
||||
dspi->bitbang.flags = SPI_NO_CS | SPI_LSB_FIRST | SPI_LOOP | SPI_CS_WORD;
|
||||
if (dspi->version == SPI_VERSION_2)
|
||||
dspi->bitbang.flags |= SPI_READY;
|
||||
|
||||
|
|
Loading…
Reference in a new issue