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: 3650b228f8

--
2.28.0
This commit is contained in:
Mark Brown 2020-11-11 15:44:32 +00:00
commit 10a58c3a30
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0