summaryrefslogtreecommitdiff
path: root/include/linux/spi/spi.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2024-06-20 21:09:48 +0100
committerMark Brown <broonie@kernel.org>2024-06-20 21:09:48 +0100
commit741b31df024c397edbc499525fa2de1514b1a627 (patch)
treed2c41f51d1c17cf116bc6f575cdb57f12621f9c3 /include/linux/spi/spi.h
parent78b05172b42d14a4c6fc6b75b31590b8977900dc (diff)
parentdf75470b317b46affbe1f5f8f006b34175be9789 (diff)
spi: Merge up fixes
We need the fixes to apply new changes to the Cirrus drivers.
Diffstat (limited to 'include/linux/spi/spi.h')
-rw-r--r--include/linux/spi/spi.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index b4a89db4c855..85785bcd20c1 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -1088,12 +1088,13 @@ struct spi_transfer {
unsigned dummy_data:1;
unsigned cs_off:1;
unsigned cs_change:1;
- unsigned tx_nbits:3;
- unsigned rx_nbits:3;
+ unsigned tx_nbits:4;
+ unsigned rx_nbits:4;
unsigned timestamped:1;
#define SPI_NBITS_SINGLE 0x01 /* 1-bit transfer */
#define SPI_NBITS_DUAL 0x02 /* 2-bit transfer */
#define SPI_NBITS_QUAD 0x04 /* 4-bit transfer */
+#define SPI_NBITS_OCTAL 0x08 /* 8-bit transfer */
u8 bits_per_word;
struct spi_delay delay;
struct spi_delay cs_change_delay;