diff options
| author |   Maxime Chevallier <maxime.chevallier@bootlin.com> | 2018-07-17 16:31:52 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2018-07-24 15:58:28 +0100 |
| commit | afb27208146af82b249e0cdc40142b4ffd211887 (patch) | |
| tree | 3dc88acc374c5ccbf5920054c3a47f410927ffbc /drivers/spi/spi-imx.c | |
| parent | spi: imx: Use dynamic bursts only when bits_per_word is 8, 16 or 32 (diff) | |
| download | linux-dev-afb27208146af82b249e0cdc40142b4ffd211887.tar.xz linux-dev-afb27208146af82b249e0cdc40142b4ffd211887.zip | |
spi: imx: Use correct number of bytes per words
The SPI core enforces that we always use the next power-of-two number of
bytes to store words. As a result, a 24 bits word will be stored in 4
bytes.
This commit fixes the spi_imx_bytes_per_word function to return the
correct number of bytes.
This also allows to get rid of unnecessary checks in the can_dma
function, since the SPI core validates that we always have a transfer
length that is a multiple of the number of bytes per word.
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-imx.c')
| -rw-r--r-- | drivers/spi/spi-imx.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index ecafbda5ec94..3ae706dac660 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -202,7 +202,12 @@ out: static int spi_imx_bytes_per_word(const int bits_per_word) { - return DIV_ROUND_UP(bits_per_word, BITS_PER_BYTE); + if (bits_per_word <= 8) + return 1; + else if (bits_per_word <= 16) + return 2; + else + return 4; } static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi, @@ -219,9 +224,6 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi, bytes_per_word = spi_imx_bytes_per_word(transfer->bits_per_word); - if (bytes_per_word != 1 && bytes_per_word != 2 && bytes_per_word != 4) - return false; - for (i = spi_imx->devtype_data->fifo_size / 2; i > 0; i--) { if (!(transfer->len % (i * bytes_per_word))) break; |