summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-12-12 15:54:03 +0000
committerMark Brown <broonie@kernel.org>2016-12-12 15:54:03 +0000
commit05232669503f54babf9f899748baf02934fd1051 (patch)
tree39155671837d79313a7c25c1a1c98f1527123dfb /drivers
parentb14a8a8028a0699d1aafa9a610b01a2ba5a749a6 (diff)
parent8eee6b9dd30d5b20a4c31886057a68bb6a2736c9 (diff)
downloadlinux-05232669503f54babf9f899748baf02934fd1051.tar.bz2
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 838783c3fed0..91b25314ba03 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -697,10 +697,15 @@ static void spi_set_cs(struct spi_device *spi, bool enable)
if (spi->mode & SPI_CS_HIGH)
enable = !enable;
- if (gpio_is_valid(spi->cs_gpio))
+ if (gpio_is_valid(spi->cs_gpio)) {
gpio_set_value(spi->cs_gpio, !enable);
- else if (spi->master->set_cs)
+ /* Some SPI masters need both GPIO CS & slave_select */
+ if ((spi->master->flags & SPI_MASTER_GPIO_SS) &&
+ spi->master->set_cs)
+ spi->master->set_cs(spi, !enable);
+ } else if (spi->master->set_cs) {
spi->master->set_cs(spi, !enable);
+ }
}
#ifdef CONFIG_HAS_DMA