]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
spi: spi-davinci: Don't error when SPI_CS_WORD and cs_gpio
authorDavid Lechner <david@lechnology.com>
Tue, 18 Sep 2018 17:08:49 +0000 (12:08 -0500)
committerMark Brown <broonie@kernel.org>
Tue, 18 Sep 2018 17:40:34 +0000 (10:40 -0700)
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>
drivers/spi/spi-davinci.c

index 205f763c73838be2ae16d192b596fe8f13731b1a..56adec83f8fc28fe020dca400e2fe9218326323e 100644 (file)
@@ -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;
                }
        }