Skip to content

Commit 7d3ca50

Browse files
scuciureanEnric Balletbo i Serra
authored andcommitted
platform/chrome: cros_ec_spi: Use new structure for SPI transfer delays
In a recent change to the SPI subsystem [1], a new `delay` struct was added to replace the `delay_usecs`. This change replaces the current `delay_usecs` with `delay` for this driver. The `spi_transfer_delay_exec()` function [in the SPI framework] makes sure that both `delay_usecs` & `delay` are used (in this order to preserve backwards compatibility). [1] commit bebcfd2 ("spi: introduce `delay` field for `spi_transfer` + spi_transfer_delay_exec()") Signed-off-by: Sergiu Cuciurean <[email protected]> Signed-off-by: Enric Balletbo i Serra <[email protected]>
1 parent f775ac7 commit 7d3ca50

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/platform/chrome/cros_ec_spi.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ static int terminate_request(struct cros_ec_device *ec_dev)
127127
*/
128128
spi_message_init(&msg);
129129
memset(&trans, 0, sizeof(trans));
130-
trans.delay_usecs = ec_spi->end_of_msg_delay;
130+
trans.delay.value = ec_spi->end_of_msg_delay;
131+
trans.delay.unit = SPI_DELAY_UNIT_NSECS;
131132
spi_message_add_tail(&trans, &msg);
132133

133134
ret = spi_sync_locked(ec_spi->spi, &msg);
@@ -416,7 +417,8 @@ static int do_cros_ec_pkt_xfer_spi(struct cros_ec_device *ec_dev,
416417
spi_message_init(&msg);
417418
if (ec_spi->start_of_msg_delay) {
418419
memset(&trans_delay, 0, sizeof(trans_delay));
419-
trans_delay.delay_usecs = ec_spi->start_of_msg_delay;
420+
trans_delay.delay.value = ec_spi->start_of_msg_delay;
421+
trans_delay.delay.unit = SPI_DELAY_UNIT_USECS;
420422
spi_message_add_tail(&trans_delay, &msg);
421423
}
422424

0 commit comments

Comments
 (0)