linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
To: <gregkh@linuxfoundation.org>, <linux-integrity@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Cc: <peterhuewe@gmx.de>, <jarkko.sakkinen@linux.intel.com>,
	<jgg@ziepe.ca>, <arnd@arndb.de>,
	Sergiu Cuciurean <sergiu.cuciurean@analog.com>
Subject: [PATCH v2] tpm: tpm_tis_spi_cr50: use new structure for SPI transfer delays
Date: Thu, 27 Feb 2020 10:03:39 +0200	[thread overview]
Message-ID: <20200227080339.6910-1-sergiu.cuciurean@analog.com> (raw)
In-Reply-To: <20200226114347.27126-1-sergiu.cuciurean@analog.com>

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>
---

Changelog v1->v2:
*Change to proper subsystem prefix

 drivers/char/tpm/tpm_tis_spi_cr50.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/char/tpm/tpm_tis_spi_cr50.c b/drivers/char/tpm/tpm_tis_spi_cr50.c
index 37d72e818335..ea759af25634 100644
--- a/drivers/char/tpm/tpm_tis_spi_cr50.c
+++ b/drivers/char/tpm/tpm_tis_spi_cr50.c
@@ -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 */
-- 
2.17.1


  parent reply	other threads:[~2020-02-27  8:05 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-26 11:43 [PATCH] Char: tpm_tis_spi_cr50: use new structure for SPI transfer delays Sergiu Cuciurean
2020-02-26 15:12 ` Jarkko Sakkinen
2020-02-27  8:03 ` Sergiu Cuciurean [this message]
2020-02-27 16:22   ` [PATCH v2] tpm: " Jarkko Sakkinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200227080339.6910-1-sergiu.cuciurean@analog.com \
    --to=sergiu.cuciurean@analog.com \
    --cc=arnd@arndb.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=jarkko.sakkinen@linux.intel.com \
    --cc=jgg@ziepe.ca \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peterhuewe@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).