From: Phil Elwell Date: Fri, 12 Oct 2018 09:23:18 +0000 (+0100) Subject: spi: Make GPIO CSs honour the SPI_NO_CS flag X-Git-Tag: v4.20-rc1~185^2~1^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25972d0c33deb5c49708baa48e7796c8d0348e98;p=thirdparty%2Flinux.git 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 Signed-off-by: Mark Brown --- diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index fcbd4cfd28188..ea3e5e146764d 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)