diff options
| author | Mark Brown <broonie@kernel.org> | 2024-06-20 21:09:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-06-20 21:09:48 +0100 |
| commit | 741b31df024c397edbc499525fa2de1514b1a627 (patch) | |
| tree | d2c41f51d1c17cf116bc6f575cdb57f12621f9c3 /drivers/spi/spi.c | |
| parent | 78b05172b42d14a4c6fc6b75b31590b8977900dc (diff) | |
| parent | df75470b317b46affbe1f5f8f006b34175be9789 (diff) | |
| download | lwn-741b31df024c397edbc499525fa2de1514b1a627.tar.gz lwn-741b31df024c397edbc499525fa2de1514b1a627.zip | |
spi: Merge up fixes
We need the fixes to apply new changes to the Cirrus drivers.
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9721adf048b5..54cbe652a4df 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -689,10 +689,12 @@ static int __spi_add_device(struct spi_device *spi) * Make sure that multiple logical CS doesn't map to the same physical CS. * For example, spi->chip_select[0] != spi->chip_select[1] and so on. */ - for (idx = 0; idx < SPI_CS_CNT_MAX; idx++) { - status = spi_dev_check_cs(dev, spi, idx, spi, idx + 1); - if (status) - return status; + if (!spi_controller_is_target(ctlr)) { + for (idx = 0; idx < SPI_CS_CNT_MAX; idx++) { + status = spi_dev_check_cs(dev, spi, idx, spi, idx + 1); + if (status) + return status; + } } /* Set the bus ID string */ @@ -4132,7 +4134,8 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message) return -EINVAL; if (xfer->tx_nbits != SPI_NBITS_SINGLE && xfer->tx_nbits != SPI_NBITS_DUAL && - xfer->tx_nbits != SPI_NBITS_QUAD) + xfer->tx_nbits != SPI_NBITS_QUAD && + xfer->tx_nbits != SPI_NBITS_OCTAL) return -EINVAL; if ((xfer->tx_nbits == SPI_NBITS_DUAL) && !(spi->mode & (SPI_TX_DUAL | SPI_TX_QUAD))) @@ -4147,7 +4150,8 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message) return -EINVAL; if (xfer->rx_nbits != SPI_NBITS_SINGLE && xfer->rx_nbits != SPI_NBITS_DUAL && - xfer->rx_nbits != SPI_NBITS_QUAD) + xfer->rx_nbits != SPI_NBITS_QUAD && + xfer->rx_nbits != SPI_NBITS_OCTAL) return -EINVAL; if ((xfer->rx_nbits == SPI_NBITS_DUAL) && !(spi->mode & (SPI_RX_DUAL | SPI_RX_QUAD))) |