Unverified Commit d11233e0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "spi: finalize 'delay_usecs' removal/transition" from Alexandru... 

Merge series "spi: finalize 'delay_usecs' removal/transition" from Alexandru Ardelean <aardelean@deviqon.com>:

A while back I started the introduction of the 'spi_delay' data type:
  https://lore.kernel.org/linux-spi/20190926105147.7839-1-alexandru.ardelean@analog.com/

Users of the 'delay_usecs' were removed from drivers.

Now it's time to remove the 'delay_usecs' from the SPI subsystem and use
only the 'delay' field.

This changeset adapts all SPI drivers to do without 'delay_usecs'.
Additionally, for greybus we need to adapt it to use the 'delay' in
nano-seconds and convert it to micro-seconds.

Alexandru Ardelean (10):
  spi: spi-axi-spi-engine: remove usage of delay_usecs
  spi: bcm63xx-spi: don't check 'delay_usecs' field
  spi: spi-bcm-qspi: replace 'delay_usecs' with 'delay.value' check
  spi: spi-sh: replace 'delay_usecs' with 'delay.value' in pr_debug
  spi: spi-tegra20-flash: don't check 'delay_usecs' field for spi
    transfer
  staging: greybus: spilib: use 'spi_delay_to_ns' for getting xfer delay
  spi: spi-falcon: remove check for 'delay_usecs'
  spi: fsl-espi: remove usage of 'delay_usecs' field
  spi: core: remove 'delay_usecs' field from spi_transfer
  spi: docs: update info about 'delay_usecs'

 Documentation/spi/spi-summary.rst |  7 +++++--
 drivers/spi/spi-axi-spi-engine.c  | 12 ++++--------
 drivers/spi/spi-bcm-qspi.c        |  2 +-
 drivers/spi/spi-bcm63xx.c         |  2 +-
 drivers/spi/spi-falcon.c          |  2 +-
 drivers/spi/spi-fsl-espi.c        | 17 +++++------------
 drivers/spi/spi-sh.c              |  4 ++--
 drivers/spi/spi-tegra20-sflash.c  |  3 +--
 drivers/spi/spi.c                 |  1 -
 drivers/staging/greybus/spilib.c  |  5 ++++-
 include/linux/spi/spi.h           | 12 ------------
 11 files changed, 24 insertions(+), 43 deletions(-)

--
2.29.2

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
parents 12ef51b1 05d8a019

Documentation/spi/spi-summary.rst

+5 −2
Original line number Diff line number Diff line
@@ -411,8 +411,11 @@ any more such messages. 
        duplex (one pointer is NULL) transfers;



      + optionally defining short delays after transfers ... using

        the spi_transfer.delay_usecs setting (this delay can be the

        only protocol effect, if the buffer length is zero);

        the spi_transfer.delay.value setting (this delay can be the

        only protocol effect, if the buffer length is zero) ...

        when specifying this delay the default spi_transfer.delay.unit

        is microseconds, however this can be adjusted to clock cycles

        or nanoseconds if needed;



      + whether the chipselect becomes inactive after a transfer and

        any delay ... by using the spi_transfer.cs_change flag;

drivers/spi/spi-axi-spi-engine.c

+4 −8
Original line number Diff line number Diff line
@@ -170,14 +170,10 @@ static void spi_engine_gen_sleep(struct spi_engine_program *p, bool dry, 
	unsigned int t;

	int delay;



	if (xfer->delay_usecs) {

		delay = xfer->delay_usecs;

	} else {

	delay = spi_delay_to_ns(&xfer->delay, xfer);

	if (delay < 0)

		return;

	delay /= 1000;

	}



	if (delay == 0)

		return;

drivers/spi/spi-bcm-qspi.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static int update_qspi_trans_byte_count(struct bcm_qspi *qspi, 
	if (qt->byte >= qt->trans->len) {

		/* we're at the end of the spi_transfer */

		/* in TX mode, need to pause for a delay or CS change */

		if (qt->trans->delay_usecs &&

		if (qt->trans->delay.value &&

		    (flags & TRANS_STATUS_BREAK_DELAY))

			ret |= TRANS_STATUS_BREAK_DELAY;

		if (qt->trans->cs_change &&

drivers/spi/spi-bcm63xx.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static int bcm63xx_spi_transfer_one(struct spi_master *master, 
		}



		/* CS will be deasserted directly after transfer */

		if (t->delay_usecs || t->delay.value) {

		if (t->delay.value) {

			dev_err(&spi->dev, "unable to keep CS asserted after transfer\n");

			status = -EINVAL;

			goto exit;

drivers/spi/spi-falcon.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static int falcon_sflash_xfer_one(struct spi_master *master, 


		m->actual_length += t->len;



		WARN_ON(t->delay_usecs || t->delay.value || t->cs_change);

		WARN_ON(t->delay.value || t->cs_change);

		spi_flags = 0;

	}