Merge series "SPI/ Input: ads7846: properly handle spi->mode flags" from Oleksij...
authorMark Brown <broonie@kernel.org>
Wed, 11 Nov 2020 15:44:32 +0000 (15:44 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 11 Nov 2020 15:44:32 +0000 (15:44 +0000)
commit10a58c3a308af20d4fecc99cd81ef37599890c25
tree10f6904c7344e153b83fb6a43ab6759a3f1d6491
parente4062765bc2a41e025e29dd56bad798505036427
parent029b42d8519cef70c4fb5fcaccd08f1053ed2bf0
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: 3650b228f83adda7e5ee532e2b90429c03f7b9ec

--
2.28.0