123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051 |
- From c9cae7e1e5c87d0aa76b7bededa5191a0c8cf25a Mon Sep 17 00:00:00 2001
- From: Miquel Raynal <[email protected]>
- Date: Thu, 27 Jan 2022 10:17:57 +0100
- Subject: [PATCH 05/15] spi: spi-mem: Check the controller extra capabilities
- Controllers can now provide a spi-mem capabilities structure. Let's make
- use of it in spi_mem_controller_default_supports_op(). As we want to
- check for DTR operations as well as normal operations in a single
- helper, let's pull the necessary checks from spi_mem_dtr_supports_op()
- for now.
- However, because no controller provide these extra capabilities, this
- change has no effect so far.
- Signed-off-by: Miquel Raynal <[email protected]>
- Reviewed-by: Pratyush Yadav <[email protected]>
- Reviewed-by: Boris Brezillon <[email protected]>
- Reviewed-by: Tudor Ambarus <[email protected]>
- Link: https://lore.kernel.org/linux-mtd/[email protected]
- (cherry picked from commit cb7e96ee81edaa48c67d84c14df2cbe464391c37)
- ---
- drivers/spi/spi-mem.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
- --- a/drivers/spi/spi-mem.c
- +++ b/drivers/spi/spi-mem.c
- @@ -173,11 +173,20 @@ EXPORT_SYMBOL_GPL(spi_mem_dtr_supports_o
- bool spi_mem_default_supports_op(struct spi_mem *mem,
- const struct spi_mem_op *op)
- {
- - if (op->cmd.dtr || op->addr.dtr || op->dummy.dtr || op->data.dtr)
- - return false;
- + struct spi_controller *ctlr = mem->spi->controller;
- + bool op_is_dtr =
- + op->cmd.dtr || op->addr.dtr || op->dummy.dtr || op->data.dtr;
-
- - if (op->cmd.nbytes != 1)
- - return false;
- + if (op_is_dtr) {
- + if (!spi_mem_controller_is_capable(ctlr, dtr))
- + return false;
- +
- + if (op->cmd.nbytes != 2)
- + return false;
- + } else {
- + if (op->cmd.nbytes != 1)
- + return false;
- + }
-
- return spi_mem_check_buswidth(mem, op);
- }
|