Merge branch 'topic/3wire-gpio' of https://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc include/linux/spi/spi.h
index 0c1ca5dedbb4794eb6e5a46eebadaa9f24560930,3ced58eebe1bc1e2cfc924f6083ff30f3334c460..314d922ca607c15c752b20caed7f25e6e8b1b5be
--- 1/include/linux/spi/spi.h
--- 2/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@@ -154,9 -154,8 +154,10 @@@ struct spi_device 
  #define       SPI_TX_QUAD     0x200                   /* transmit with 4 wires */
  #define       SPI_RX_DUAL     0x400                   /* receive with 2 wires */
  #define       SPI_RX_QUAD     0x800                   /* receive with 4 wires */
 -#define SPI_CS_WORD   0x1000                  /* toggle cs after each word */
 -#define       SPI_3WIRE_HIZ   0x2000                  /* high impedance turnaround */
 +#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;