From 4c5472af2c106e0a6633ffe72d71a1316db45998 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 12 Oct 2018 10:23:18 +0100 Subject: [PATCH] UPSTREAM: 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. Change-Id: I75e69b1eb5068357d9abfe8236cfbd2188c626f1 Signed-off-by: Phil Elwell Signed-off-by: Mark Brown Signed-off-by: Jon Lin (cherry picked from commit 25972d0c33deb5c49708baa48e7796c8d0348e98) --- drivers/spi/spi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index b11f57b577eb..6fc5b3de85b9 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)