diff options
| author | Mark Brown <broonie@kernel.org> | 2020-11-11 18:44:32 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-11-11 18:44:32 +0300 |
| commit | 10a58c3a308af20d4fecc99cd81ef37599890c25 (patch) | |
| tree | 10f6904c7344e153b83fb6a43ab6759a3f1d6491 | |
| parent | e4062765bc2a41e025e29dd56bad798505036427 (diff) | |
| parent | 029b42d8519cef70c4fb5fcaccd08f1053ed2bf0 (diff) | |
| download | linux-10a58c3a308af20d4fecc99cd81ef37599890c25.tar.xz | |
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
| -rw-r--r-- | include/linux/spi/spi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 99380c0825db..8097f27702f3 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -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 */ |