diff options
| author | Pratyush Yadav <p.yadav@ti.com> | 2021-02-04 19:42:18 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-02-11 15:51:37 +0000 |
| commit | d2275139649bc34b8b5c3e33d26d991ab8a1364c (patch) | |
| tree | 761165969fcc3d2d30c291998273c0313ec1207a /drivers/spi | |
| parent | 539cf68cd51bfcd2987ce1c44e628e9da69de7c8 (diff) | |
spi: cadence-quadspi: Use spi_mem_dtr_supports_op()
Use the newly introduced spi_mem_dtr_supports_op() to check DTR op
support. This means the buswidth check does not need to be replicated.
It also happens to fix a bug where STR ops with a 2-byte opcode would be
reported as supported.
Signed-off-by: Pratyush Yadav <p.yadav@ti.com>
Link: https://lore.kernel.org/r/20210204141218.32229-2-p.yadav@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-cadence-quadspi.c | 63 |
1 files changed, 4 insertions, 59 deletions
diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index b7ecbc8c1caa..442cc7c53a47 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1219,65 +1219,11 @@ static int cqspi_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op) return ret; } -static int cqspi_check_buswidth_req(struct spi_mem *mem, u8 buswidth, bool tx) -{ - u32 mode = mem->spi->mode; - - switch (buswidth) { - case 1: - return 0; - - case 2: - 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 | SPI_TX_OCTAL))) || - (!tx && (mode & (SPI_RX_QUAD | SPI_RX_OCTAL)))) - return 0; - - break; - - case 8: - if ((tx && (mode & SPI_TX_OCTAL)) || - (!tx && (mode & SPI_RX_OCTAL))) - return 0; - - break; - - default: - break; - } - - return -EOPNOTSUPP; -} - static bool cqspi_supports_mem_op(struct spi_mem *mem, const struct spi_mem_op *op) { bool all_true, all_false; - if (cqspi_check_buswidth_req(mem, op->cmd.buswidth, true)) - return false; - - if (op->addr.nbytes && - cqspi_check_buswidth_req(mem, op->addr.buswidth, true)) - return false; - - if (op->dummy.nbytes && - cqspi_check_buswidth_req(mem, op->dummy.buswidth, true)) - return false; - - if (op->data.nbytes && - cqspi_check_buswidth_req(mem, op->data.buswidth, - op->data.dir == SPI_MEM_DATA_OUT)) - return false; - all_true = op->cmd.dtr && op->addr.dtr && op->dummy.dtr && op->data.dtr; all_false = !op->cmd.dtr && !op->addr.dtr && !op->dummy.dtr && @@ -1287,11 +1233,10 @@ static bool cqspi_supports_mem_op(struct spi_mem *mem, if (!(all_true || all_false)) return false; - /* DTR mode opcodes should be 2 bytes. */ - if (all_true && op->cmd.nbytes != 2) - return false; - - return true; + if (all_true) + return spi_mem_dtr_supports_op(mem, op); + else + return spi_mem_default_supports_op(mem, op); } static int cqspi_of_get_flash_pdata(struct platform_device *pdev, |