Unverified Commit 10a58c3a authored Nov 11, 2020 by Mark Brown

Merge series "SPI/ Input: ads7846: properly handle spi->mode flags" from...

Merge series "SPI/ Input: ads7846: properly handle spi->mode flags" from Oleksij Rempel <o.rempel@pengutronix.de>:

changes v2:
- add SPI_MODE_X_MASK macro
- ads7846: clear SPI_MODE_X_MASK bits to set driver specific mode.

Oleksij Rempel (2):
  spi: introduce SPI_MODE_X_MASK macro
  Input: ads7846: do not overwrite spi->mode flags set by spi framework

 drivers/input/touchscreen/ads7846.c | 3 ++-
 include/linux/spi/spi.h             | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

commit-base: 3650b228

--
2.28.0

parents e4062765 029b42d8

include/linux/spi/spi.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,7 @@ struct spi_device {
		#define SPI_MODE_1 (0\|SPI_CPHA)
		#define SPI_MODE_2 (SPI_CPOL\|0)
		#define SPI_MODE_3 (SPI_CPOL\|SPI_CPHA)
		#define SPI_MODE_X_MASK (SPI_CPOL\|SPI_CPHA)
		#define SPI_CS_HIGH 0x04 /* chipselect active high? */
		#define SPI_LSB_FIRST 0x08 /* per-word bits-on-wire */
		#define SPI_3WIRE 0x10 /* SI/SO signals shared */

Admin message