diff options
author | Mark Brown <broonie@kernel.org> | 2021-06-25 14:08:26 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-06-25 14:08:26 +0100 |
commit | 1bee1ecf232cd90ad112d78ab5124850b4e5ea09 (patch) | |
tree | 850cf42ea49ec040c2042fdd8bc61d332461e948 /drivers/spi/spi-oc-tiny.c | |
parent | edf978a5a17dc9e38625b33821dc71f10c46f694 (diff) | |
parent | b470e10eb43f19e08245cd87dd3192a8141cfbb5 (diff) |
Merge remote-tracking branch 'spi/for-5.14' into spi-next
Diffstat (limited to 'drivers/spi/spi-oc-tiny.c')
-rw-r--r-- | drivers/spi/spi-oc-tiny.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c index f3843f0ff260..38c14c4e4e21 100644 --- a/drivers/spi/spi-oc-tiny.c +++ b/drivers/spi/spi-oc-tiny.c @@ -86,7 +86,7 @@ static int tiny_spi_setup(struct spi_device *spi) hw->speed_hz = spi->max_speed_hz; hw->baud = tiny_spi_baud(spi, hw->speed_hz); } - hw->mode = spi->mode & (SPI_CPOL | SPI_CPHA); + hw->mode = spi->mode & SPI_MODE_X_MASK; return 0; } |