diff options
| author | David Lechner <david@lechnology.com> | 2018-09-18 12:08:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-18 10:40:32 -0700 |
| commit | 71388b21569754ecd36eabd66fd9ca8c6d761fed (patch) | |
| tree | 8031600f534f49f24b081cba31d2ebffc00fca75 /drivers | |
| parent | 00bca73bfca4fb0ab089b94cad0fc83d8b49c25f (diff) | |
| download | lwn-71388b21569754ecd36eabd66fd9ca8c6d761fed.tar.gz lwn-71388b21569754ecd36eabd66fd9ca8c6d761fed.zip | |
spi: always use software fallback for SPI_CS_WORD when using cs_gio
This modifies the condition for using the software fallback
implementation for SPI_CS_WORD when the SPI controller is using a GPIO
for the CS line. When using a GPIO for CS, the hardware implementation
won't work, so we just enable the software fallback globally in this
case.
Signed-off-by: David Lechner <david@lechnology.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index be73d236919f..a358acdd98d3 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2832,11 +2832,13 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message) return -EINVAL; /* If an SPI controller does not support toggling the CS line on each - * transfer (indicated by the SPI_CS_WORD flag), we can emulate it by + * transfer (indicated by the SPI_CS_WORD flag) or we are using a GPIO + * for the CS line, we can emulate the CS-per-word hardware function by * splitting transfers into one-word transfers and ensuring that * cs_change is set for each transfer. */ - if ((spi->mode & SPI_CS_WORD) && !(ctlr->mode_bits & SPI_CS_WORD)) { + if ((spi->mode & SPI_CS_WORD) && (!(ctlr->mode_bits & SPI_CS_WORD) || + gpio_is_valid(spi->cs_gpio))) { size_t maxsize; int ret; |