summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-davinci.c
diff options
context:
space:
mode:
authorDavid Lechner <david@lechnology.com>2018-09-18 12:08:49 -0500
committerMark Brown <broonie@kernel.org>2018-09-18 10:40:34 -0700
commitf34ecdbd5661816ce8bbd7511f33181ffa8f4895 (patch)
treef41b1ce59c3fc9733cd81bc714bc4a9286543573 /drivers/spi/spi-davinci.c
parent71388b21569754ecd36eabd66fd9ca8c6d761fed (diff)
downloadlinux-f34ecdbd5661816ce8bbd7511f33181ffa8f4895.tar.bz2
spi: spi-davinci: Don't error when SPI_CS_WORD and cs_gpio
This remove the check and subsequent return of error for the case when a SPI device requires SPI_CS_WORD and is also configured to use a GPIO for the CS line. Commit a134cc414e86 ("spi: always use software fallback for SPI_CS_WORD when using cs_gio") handles this case now, so this check is no longer necessary. Signed-off-by: David Lechner <david@lechnology.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-davinci.c')
-rw-r--r--drivers/spi/spi-davinci.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 205f763c7383..56adec83f8fc 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -441,9 +441,6 @@ static int davinci_spi_setup(struct spi_device *spi)
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;
}
}