diff options
| author | Mark Brown <broonie@kernel.org> | 2019-12-25 18:18:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-12-25 18:18:54 +0000 |
| commit | 790514ed7715334949125de39989720dc0985f15 (patch) | |
| tree | c2dd3cdabcf825170349f9f39b284dc59e11e065 /drivers/spi/spi-dw.c | |
| parent | 0d9c75481a8e0129f82e0b09a5e36eb1cc76c2b8 (diff) | |
| parent | 9cd34efbd3012171c102910ce17ee632a3cccb44 (diff) | |
Merge branch 'for-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.6
Diffstat (limited to 'drivers/spi/spi-dw.c')
| -rw-r--r-- | drivers/spi/spi-dw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index a160d9a141ea..73f50f4d9711 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -129,10 +129,11 @@ void dw_spi_set_cs(struct spi_device *spi, bool enable) struct dw_spi *dws = spi_controller_get_devdata(spi->controller); struct chip_data *chip = spi_get_ctldata(spi); + /* Chip select logic is inverted from spi_set_cs() */ if (chip && chip->cs_control) - chip->cs_control(enable); + chip->cs_control(!enable); - if (enable) + if (!enable) dw_writel(dws, DW_SPI_SER, BIT(spi->chip_select)); else if (dws->cs_override) dw_writel(dws, DW_SPI_SER, 0); |