Merge branch 'topic/3wire-gpio' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-4.21 mode conflict

This commit is contained in:
Mark Brown 2018-12-04 17:31:49 +00:00
commit ae218f7847
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
2 changed files with 22 additions and 3 deletions

View file

@ -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;