summaryrefslogtreecommitdiffstats
path: root/include
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 /include
parentb14a8a8028a0699d1aafa9a610b01a2ba5a749a6 (diff)
parent8eee6b9dd30d5b20a4c31886057a68bb6a2736c9 (diff)
downloadlinux-stable-05232669503f54babf9f899748baf02934fd1051.tar.gz
linux-stable-05232669503f54babf9f899748baf02934fd1051.tar.bz2
linux-stable-05232669503f54babf9f899748baf02934fd1051.zip
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'include')
-rw-r--r--include/linux/spi/spi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 4b743ac35396..75c6bd0ac605 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -442,6 +442,7 @@ struct spi_master {
#define SPI_MASTER_NO_TX BIT(2) /* can't do buffer write */
#define SPI_MASTER_MUST_RX BIT(3) /* requires rx */
#define SPI_MASTER_MUST_TX BIT(4) /* requires tx */
+#define SPI_MASTER_GPIO_SS BIT(5) /* GPIO CS must select slave */
/*
* on some hardware transfer / message size may be constrained