]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
platform/chrome: cros_ec_spi: Use new structure for SPI transfer delays
authorSergiu Cuciurean <sergiu.cuciurean@analog.com>
Thu, 27 Feb 2020 14:09:17 +0000 (16:09 +0200)
committerEnric Balletbo i Serra <enric.balletbo@collabora.com>
Mon, 2 Mar 2020 10:04:04 +0000 (11:04 +0100)
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 bebcfd272df6 ("spi: introduce `delay` field for
`spi_transfer` + spi_transfer_delay_exec()")

Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
drivers/platform/chrome/cros_ec_spi.c

index 46786d2d679a85db211ec1c492b5db092c62eff1..665ab154bb4fbccf60d76e10e6544071d5fb11c1 100644 (file)
@@ -127,7 +127,8 @@ static int terminate_request(struct cros_ec_device *ec_dev)
         */
        spi_message_init(&msg);
        memset(&trans, 0, sizeof(trans));
-       trans.delay_usecs = ec_spi->end_of_msg_delay;
+       trans.delay.value = ec_spi->end_of_msg_delay;
+       trans.delay.unit = SPI_DELAY_UNIT_NSECS;
        spi_message_add_tail(&trans, &msg);
 
        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,
        spi_message_init(&msg);
        if (ec_spi->start_of_msg_delay) {
                memset(&trans_delay, 0, sizeof(trans_delay));
-               trans_delay.delay_usecs = ec_spi->start_of_msg_delay;
+               trans_delay.delay.value = ec_spi->start_of_msg_delay;
+               trans_delay.delay.unit = SPI_DELAY_UNIT_USECS;
                spi_message_add_tail(&trans_delay, &msg);
        }