Merge branch 'spi-4.21' into spi-next

2 files changed, 5 insertions, 1 deletions

diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h
index 9ec4c147abbc..b0674e330ef6 100644
--- a/include/linux/spi/pxa2xx_spi.h
+++ b/include/linux/spi/pxa2xx_spi.h
@@ -25,6 +25,7 @@ struct dma_chan;
 struct pxa2xx_spi_master {
         u16 num_chipselect;
         u8 enable_dma;
+        bool is_slave;
 
         /* DMA engine specific config */
         bool (*dma_filter)(struct dma_chan *chan, void *param);
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 6be77fa5ab90..314d922ca607 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -154,7 +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_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;