diff options
author | Jan Kundrát <jan.kundrat@cesnet.cz> | 2019-03-07 09:29:42 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-03-18 08:18:28 -0400 |
commit | 2ed6692e8ce924346c3aab5585b07005adb30625 (patch) | |
tree | 9c77ba50e365714bc1d4e5cfd5dfee6382cc416b /drivers/spi/spidev.c | |
parent | 4e3891a55f671a4e641d2ef4e5ec0e27e56b20d9 (diff) |
spi: spidev: Enable control of inter-word delays
Commit b7bb367afa4b added support for inserting delays in between
individual words within a single SPI transaction. This makes it
accessible from userspace.
WARNING: This delay is silently ignored unless the SPI controller
implements extra support for it. This is similar to how the in-kernel
users handle the other existing property, spi_transfer->word_delay.
Signed-off-by: Jan Kundrát <jan.kundrat@cesnet.cz>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spidev.c')
-rw-r--r-- | drivers/spi/spidev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index b0c76e2626ce..70966e10be7e 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c | |||
@@ -276,17 +276,19 @@ static int spidev_message(struct spidev_data *spidev, | |||
276 | k_tmp->bits_per_word = u_tmp->bits_per_word; | 276 | k_tmp->bits_per_word = u_tmp->bits_per_word; |
277 | k_tmp->delay_usecs = u_tmp->delay_usecs; | 277 | k_tmp->delay_usecs = u_tmp->delay_usecs; |
278 | k_tmp->speed_hz = u_tmp->speed_hz; | 278 | k_tmp->speed_hz = u_tmp->speed_hz; |
279 | k_tmp->word_delay_usecs = u_tmp->word_delay_usecs; | ||
279 | if (!k_tmp->speed_hz) | 280 | if (!k_tmp->speed_hz) |
280 | k_tmp->speed_hz = spidev->speed_hz; | 281 | k_tmp->speed_hz = spidev->speed_hz; |
281 | #ifdef VERBOSE | 282 | #ifdef VERBOSE |
282 | dev_dbg(&spidev->spi->dev, | 283 | dev_dbg(&spidev->spi->dev, |
283 | " xfer len %u %s%s%s%dbits %u usec %uHz\n", | 284 | " xfer len %u %s%s%s%dbits %u usec %u usec %uHz\n", |
284 | u_tmp->len, | 285 | u_tmp->len, |
285 | u_tmp->rx_buf ? "rx " : "", | 286 | u_tmp->rx_buf ? "rx " : "", |
286 | u_tmp->tx_buf ? "tx " : "", | 287 | u_tmp->tx_buf ? "tx " : "", |
287 | u_tmp->cs_change ? "cs " : "", | 288 | u_tmp->cs_change ? "cs " : "", |
288 | u_tmp->bits_per_word ? : spidev->spi->bits_per_word, | 289 | u_tmp->bits_per_word ? : spidev->spi->bits_per_word, |
289 | u_tmp->delay_usecs, | 290 | u_tmp->delay_usecs, |
291 | u_tmp->word_delay_usecs, | ||
290 | u_tmp->speed_hz ? : spidev->spi->max_speed_hz); | 292 | u_tmp->speed_hz ? : spidev->spi->max_speed_hz); |
291 | #endif | 293 | #endif |
292 | spi_message_add_tail(k_tmp, &msg); | 294 | spi_message_add_tail(k_tmp, &msg); |