Unverified Commit 80300a7d authored Apr 16, 2020 by Geert Uytterhoeven Committed by Mark Brown Apr 23, 2020

spi: spi-mem: Fix Dual/Quad modes on Octal-capable devices

Currently buswidths 2 and 4 are rejected for a device that advertises
Octal capabilities. Allow these buswidths, just like is done for
buswidth 2 and Quad-capable devices.

Fixes: b12a084c ("spi: spi-mem: add support for octal mode I/O data transfer")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20200416101418.14379-1-geert+renesas@glider.be

Signed-off-by: Mark Brown <broonie@kernel.org>

parent f58dcab6

drivers/spi/spi-mem.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -108,15 +108,17 @@ static int spi_check_buswidth_req(struct spi_mem *mem, u8 buswidth, bool tx)
		return 0;

		case 2:
		if ((tx && (mode & (SPI_TX_DUAL \| SPI_TX_QUAD))) \|\|
		(!tx && (mode & (SPI_RX_DUAL \| SPI_RX_QUAD))))
		if ((tx &&
		(mode & (SPI_TX_DUAL \| SPI_TX_QUAD \| SPI_TX_OCTAL))) \|\|
		(!tx &&
		(mode & (SPI_RX_DUAL \| SPI_RX_QUAD \| SPI_RX_OCTAL))))
		return 0;

		break;

		case 4:
		if ((tx && (mode & SPI_TX_QUAD)) \|\|
		(!tx && (mode & SPI_RX_QUAD)))
		if ((tx && (mode & (SPI_TX_QUAD \| SPI_TX_OCTAL))) \|\|
		(!tx && (mode & (SPI_RX_QUAD \| SPI_RX_OCTAL))))
		return 0;

		break;