Commit 70d6027f authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

spi: add spi_master flag word



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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b55f627f
...@@ -1313,6 +1313,12 @@ static int mmc_spi_probe(struct spi_device *spi) ...@@ -1313,6 +1313,12 @@ static int mmc_spi_probe(struct spi_device *spi)
struct mmc_spi_host *host; struct mmc_spi_host *host;
int status; 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 /* 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 * 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, * should be legit. We'll use mode 0 since the steady state is 0,
......
...@@ -514,6 +514,8 @@ static int __init uwire_probe(struct platform_device *pdev) ...@@ -514,6 +514,8 @@ static int __init uwire_probe(struct platform_device *pdev)
/* the spi->mode bits understood by this driver: */ /* the spi->mode bits understood by this driver: */
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
master->flags = SPI_MASTER_HALF_DUPLEX;
master->bus_num = 2; /* "official" */ master->bus_num = 2; /* "official" */
master->num_chipselect = 4; master->num_chipselect = 4;
master->setup = uwire_setup; master->setup = uwire_setup;
......
...@@ -250,6 +250,10 @@ struct spi_master { ...@@ -250,6 +250,10 @@ struct spi_master {
/* spi_device.mode flags understood by this controller driver */ /* spi_device.mode flags understood by this controller driver */
u16 mode_bits; 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). /* Setup mode and clock, etc (spi driver may call many times).
* *
* IMPORTANT: this may be called when transfers to another * IMPORTANT: this may be called when transfers to another
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment