From: Mark Brown Date: Tue, 4 Dec 2018 17:31:49 +0000 (+0000) Subject: Merge branch 'topic/3wire-gpio' of https://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v5.15~7377^2~1^2~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae218f7847fcf32e75ba82b1f3ab01fe53731d7a;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'topic/3wire-gpio' of https://git./linux/kernel/git/broonie/spi into spi-4.21 mode conflict --- ae218f7847fcf32e75ba82b1f3ab01fe53731d7a diff --cc include/linux/spi/spi.h index 0c1ca5dedbb4,3ced58eebe1b..314d922ca607 --- a/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;