History

Merge branch 'spi-5.2' into spi-next

Mark Brown committed 7 years ago

Commit 2e5f0812 parents 58b860e d61ad2355 files · +2408 −649Browse files

Showing the changes to include/uapi/linux (1 of 55 files). Show all

Unified · Split

include/uapi/linux/spi/spidev.h+5−1
@@ -66,6 +66,9 @@ · 65 unmodified lines
6666 * @delay_usecs: If nonzero, how long to delay after the last bit transfer
6767 * before optionally deselecting the device before the next transfer.
6868 * @cs_change: True to deselect device before starting the next transfer.
69+ * @word_delay_usecs: If nonzero, how long to wait between words within one
70+ * transfer. This property needs explicit support in the SPI controller,
71+ * otherwise it is silently ignored.
6972 *
7073 * This structure is mapped directly to the kernel spi_transfer structure;
7174 * the fields have the same meanings, except of course that the pointers
@@ -100,7 +103,8 @@ struct spi_ioc_transfer { · 28 unmodified lines
100103 __u8 cs_change;
101104 __u8 tx_nbits;
102105 __u8 rx_nbits;
103− __u16 pad;
106+ __u8 word_delay_usecs;
107+ __u8 pad;
104108
105109 /* If the contents of 'struct spi_ioc_transfer' ever change
106110 * incompatibly, then the ioctl number (currently 0) must change;