niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

spi: spi-mtk-nor: support standard spi properties

Browse source 
Use default supports_op() to support spi-[rt]x-bus-width properties.
And check dummy op's byte length instead of its bus width for output.

Signed-off-by: Ikjoon Jang <ikjn@chromium.org>
Link: https://lore.kernel.org/r/20200826091852.519138-1-ikjn@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ikjoon Jang 2020-08-26 17:18:52 +08:00 • committed by Mark Brown
parent 7708aff1e2
commit a59b2c7c56
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/spi/spi-mtk-nor.c
View file

@ -211,25 +211,28 @@ static bool mtk_nor_supports_op(struct spi_mem *mem,
if (op->cmd.buswidth != 1) if (op->cmd.buswidth != 1)
return false; return false;
/* DTR ops not supported. */
if (op->cmd.dtr || op->addr.dtr || op->dummy.dtr || op->data.dtr)
return false;
if (op->cmd.nbytes != 1)
return false;
if ((op->addr.nbytes == 3) || (op->addr.nbytes == 4)) { if ((op->addr.nbytes == 3) || (op->addr.nbytes == 4)) {
if ((op->data.dir == SPI_MEM_DATA_IN) && mtk_nor_match_read(op)) switch(op->data.dir) {
return true; case SPI_MEM_DATA_IN:
else if (op->data.dir == SPI_MEM_DATA_OUT) if (!mtk_nor_match_read(op))
return (op->addr.buswidth == 1) && return false;
(op->dummy.buswidth == 0) && break;
(op->data.buswidth == 1); case SPI_MEM_DATA_OUT:
if ((op->addr.buswidth != 1) ||
(op->dummy.nbytes != 0) ||
(op->data.buswidth != 1))
return false;
break;
default:
break;
}
} }
len = op->cmd.nbytes + op->addr.nbytes + op->dummy.nbytes; len = op->cmd.nbytes + op->addr.nbytes + op->dummy.nbytes;
if ((len > MTK_NOR_PRG_MAX_SIZE) || if ((len > MTK_NOR_PRG_MAX_SIZE) ||
((op->data.nbytes) && (len == MTK_NOR_PRG_MAX_SIZE))) ((op->data.nbytes) && (len == MTK_NOR_PRG_MAX_SIZE)))
return false; return false;
return true;
return spi_mem_default_supports_op(mem, op);
} }
static void mtk_nor_setup_bus(struct mtk_nor *sp, const struct spi_mem_op *op) static void mtk_nor_setup_bus(struct mtk_nor *sp, const struct spi_mem_op *op)