diff options
| author | Phil Elwell <phil@raspberrypi.org> | 2018-10-12 12:23:18 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-10-12 19:47:28 +0300 |
| commit | 25972d0c33deb5c49708baa48e7796c8d0348e98 (patch) | |
| tree | 5abf7ddb64a808d6fddf95333ee07a1e66313f01 /drivers/spi | |
| parent | 44221ebae2da9daad053e383240d8aeacacaa43e (diff) | |
| download | linux-25972d0c33deb5c49708baa48e7796c8d0348e98.tar.xz | |
spi: Make GPIO CSs honour the SPI_NO_CS flag
The SPI configuration state includes an SPI_NO_CS flag that disables
all CS line manipulation, for applications that want to manage their
own chip selects. However, this flag is ignored by the GPIO CS code
in the SPI framework.
Correct this omission with a trivial patch.
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index fcbd4cfd2818..ea3e5e146764 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -775,7 +775,9 @@ static void spi_set_cs(struct spi_device *spi, bool enable) enable = !enable; if (gpio_is_valid(spi->cs_gpio)) { - gpio_set_value(spi->cs_gpio, !enable); + /* Honour the SPI_NO_CS flag */ + if (!(spi->mode & SPI_NO_CS)) + gpio_set_value(spi->cs_gpio, !enable); /* Some SPI masters need both GPIO CS & slave_select */ if ((spi->controller->flags & SPI_MASTER_GPIO_SS) && spi->controller->set_cs) |