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-uniphier.c | |
| parent | edf978a5a17dc9e38625b33821dc71f10c46f694 (diff) | |
| parent | b470e10eb43f19e08245cd87dd3192a8141cfbb5 (diff) | |
Merge remote-tracking branch 'spi/for-5.14' into spi-next
Diffstat (limited to 'drivers/spi/spi-uniphier.c')
| -rw-r--r-- | drivers/spi/spi-uniphier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c index 6a9ef8ee3cc9..8900e51e1a1c 100644 --- a/drivers/spi/spi-uniphier.c +++ b/drivers/spi/spi-uniphier.c @@ -142,7 +142,7 @@ static void uniphier_spi_set_mode(struct spi_device *spi) * FSTRT start frame timing * 0: rising edge of clock, 1: falling edge of clock */ - switch (spi->mode & (SPI_CPOL | SPI_CPHA)) { + switch (spi->mode & SPI_MODE_X_MASK) { case SPI_MODE_0: /* CKPHS=1, CKINIT=0, CKDLY=1, FSTRT=0 */ val1 = SSI_CKS_CKPHS | SSI_CKS_CKDLY; |