spi: add spi_master flag word

PATCH New David Brownell 1 participant 1 message Jun 23, 2009

Subsystems (3)

SPI MMC, SD and SDIO Multimedia card (MMC) etc. over SPI

lore

Share & tools

lore

David Brownell

author

2009-06-23 19:09 UTC #0 lore raw

PATCH 1/1 spi: add spi_master flag word

From: David Brownell <[email protected]>

Add a new spi_master.flags word listing constraints relevant to that controller. Define the first constraint bit: a half duplex restriction. Include that constraint in the OMAP1 MicroWire controller driver.

Have the mmc_spi host be the first customer of this flag. Its coding relies heavily on full duplex transfers, so it must fail when the underlying controller driver won't perform them.

(The spi_write_then_read routine could use it too: use the temporarily-withdrawn full-duplex speedup unless this flag is set, in which case the existing code applies. Similarly, any spi_master implementing only SPI_3WIRE should set the flag.)

Signed-off-by David Brownell <[email protected]>

---
 drivers/mmc/host/mmc_spi.c |    6 ++++++
 drivers/spi/omap_uwire.c   |    2 ++
 include/linux/spi/spi.h    |    4 ++++
 3 files changed, 12 insertions(+)

drivers/mmc/host/mmc_spi.c +6 -0

@@ -1313,6 +1313,12 @@ static int mmc_spi_probe(struct spi_devi
 	struct mmc_spi_host	*host;
 	int			status;
 
+	/* We rely on full duplex transfers, mostly to reduce
+	 * per-transfer overheads (by making fewer transfers).
+	 */
+	if (spi->master->flags & SPI_MASTER_HALF_DUPLEX)
+		return -EINVAL;
+
 	/* MMC and SD specs only seem to care that sampling is on the
 	 * rising edge ... meaning SPI modes 0 or 3.  So either SPI mode
 	 * should be legit.  We'll use mode 0 since the steady state is 0,

drivers/spi/omap_uwire.c +2 -0

@@ -514,6 +514,8 @@ static int __init uwire_probe(struct pla
 	/* the spi->mode bits understood by this driver: */
 	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
 
+	master->flags = SPI_MASTER_HALF_DUPLEX;
+
 	master->bus_num = 2;	/* "official" */
 	master->num_chipselect = 4;
 	master->setup = uwire_setup;

include/linux/spi/spi.h +4 -0

@@ -250,6 +250,10 @@ struct spi_master {
 	/* spi_device.mode flags understood by this controller driver */
 	u16			mode_bits;
 
+	/* other constraints relevant to this driver */
+	u16			flags;
+#define SPI_MASTER_HALF_DUPLEX	BIT(0)		/* can't do full duplex */
+
 	/* Setup mode and clock, etc (spi driver may call many times).
 	 *
 	 * IMPORTANT:  this may be called when transfers to another

------------------------------------------------------------------------------