Merge branch 'spi-4.21' into spi-next
This commit is contained in:
commit
b3fc4e0e96
35 changed files with 2388 additions and 679 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue