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-imx.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-imx.c')
| -rw-r--r-- | drivers/spi/spi-imx.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index cf0cb52946d2..6f1cd3453c97 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -660,18 +660,8 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, ctrl |= (spi_imx->target_burst * 8 - 1) << MX51_ECSPI_CTRL_BL_OFFSET; else { - if (spi_imx->usedma) { - ctrl |= (spi_imx->bits_per_word - 1) - << MX51_ECSPI_CTRL_BL_OFFSET; - } else { - if (spi_imx->count >= MX51_ECSPI_CTRL_MAX_BURST) - ctrl |= (MX51_ECSPI_CTRL_MAX_BURST * BITS_PER_BYTE - 1) - << MX51_ECSPI_CTRL_BL_OFFSET; - else - ctrl |= (spi_imx->count / DIV_ROUND_UP(spi_imx->bits_per_word, - BITS_PER_BYTE) * spi_imx->bits_per_word - 1) - << MX51_ECSPI_CTRL_BL_OFFSET; - } + ctrl |= (spi_imx->bits_per_word - 1) + << MX51_ECSPI_CTRL_BL_OFFSET; } /* set clock speed */ |