summaryrefslogtreecommitdiff
path: root/include/linux/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-12-04 17:31:49 +0000
committerMark Brown <broonie@kernel.org>2018-12-04 17:31:49 +0000
commitae218f7847fcf32e75ba82b1f3ab01fe53731d7a (patch)
treeaeb782a46c38b1fa561aef92c65125bf29cbafa6 /include/linux/spi
parent32215a6c6beb8dcda4bb0759b04ce3c30927963b (diff)
parent5132b3d283710d196cd8af99b5585507e8b30709 (diff)
Merge branch 'topic/3wire-gpio' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-4.21 mode conflict
Diffstat (limited to 'include/linux/spi')
-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 0c1ca5dedbb4..314d922ca607 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -157,6 +157,7 @@ struct spi_device {
#define SPI_CS_WORD 0x1000 /* toggle cs after each word */
#define SPI_TX_OCTAL 0x2000 /* transmit with 8 wires */
#define SPI_RX_OCTAL 0x4000 /* receive with 8 wires */
+#define SPI_3WIRE_HIZ 0x8000 /* high impedance turnaround */
int irq;
void *controller_state;
void *controller_data;