Skip to content

Commit

Permalink
tpm: tpm_tis_spi_cr50: use new structure for SPI transfer delays
Browse files Browse the repository at this point in the history
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 <sergiu.cuciurean@analog.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
  • Loading branch information
Sergiu Cuciurean authored and Jarkko Sakkinen committed Mar 13, 2020
1 parent ad28db7 commit ac97b06
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/char/tpm/tpm_tis_spi_cr50.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,12 @@ static void cr50_wake_if_needed(struct cr50_spi_phy *cr50_phy)

if (cr50_needs_waking(cr50_phy)) {
/* Assert CS, wait 1 msec, deassert CS */
struct spi_transfer spi_cs_wake = { .delay_usecs = 1000 };
struct spi_transfer spi_cs_wake = {
.delay = {
.value = 1000,
.unit = SPI_DELAY_UNIT_USECS
}
};

spi_sync_transfer(phy->spi_device, &spi_cs_wake, 1);
/* Wait for it to fully wake */
Expand Down

0 comments on commit ac97b06

Please sign in to comment.