Commit 4c5e2bba authored by Pratyush Yadav's avatar Pratyush Yadav Committed by Mark Brown

spi: spi-mem: allow specifying whether an op is DTR or not

Each phase is given a separate 'dtr' field so mixed protocols like
4S-4D-4D can be supported.
Signed-off-by: default avatarPratyush Yadav <p.yadav@ti.com>
Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20200623183030.26591-2-p.yadav@ti.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent b3a9e3b9
...@@ -156,6 +156,9 @@ bool spi_mem_default_supports_op(struct spi_mem *mem, ...@@ -156,6 +156,9 @@ bool spi_mem_default_supports_op(struct spi_mem *mem,
op->data.dir == SPI_MEM_DATA_OUT)) op->data.dir == SPI_MEM_DATA_OUT))
return false; return false;
if (op->cmd.dtr || op->addr.dtr || op->dummy.dtr || op->data.dtr)
return false;
return true; return true;
} }
EXPORT_SYMBOL_GPL(spi_mem_default_supports_op); EXPORT_SYMBOL_GPL(spi_mem_default_supports_op);
......
...@@ -71,9 +71,11 @@ enum spi_mem_data_dir { ...@@ -71,9 +71,11 @@ enum spi_mem_data_dir {
* struct spi_mem_op - describes a SPI memory operation * struct spi_mem_op - describes a SPI memory operation
* @cmd.buswidth: number of IO lines used to transmit the command * @cmd.buswidth: number of IO lines used to transmit the command
* @cmd.opcode: operation opcode * @cmd.opcode: operation opcode
* @cmd.dtr: whether the command opcode should be sent in DTR mode or not
* @addr.nbytes: number of address bytes to send. Can be zero if the operation * @addr.nbytes: number of address bytes to send. Can be zero if the operation
* does not need to send an address * does not need to send an address
* @addr.buswidth: number of IO lines used to transmit the address cycles * @addr.buswidth: number of IO lines used to transmit the address cycles
* @addr.dtr: whether the address should be sent in DTR mode or not
* @addr.val: address value. This value is always sent MSB first on the bus. * @addr.val: address value. This value is always sent MSB first on the bus.
* Note that only @addr.nbytes are taken into account in this * Note that only @addr.nbytes are taken into account in this
* address value, so users should make sure the value fits in the * address value, so users should make sure the value fits in the
...@@ -81,7 +83,9 @@ enum spi_mem_data_dir { ...@@ -81,7 +83,9 @@ enum spi_mem_data_dir {
* @dummy.nbytes: number of dummy bytes to send after an opcode or address. Can * @dummy.nbytes: number of dummy bytes to send after an opcode or address. Can
* be zero if the operation does not require dummy bytes * be zero if the operation does not require dummy bytes
* @dummy.buswidth: number of IO lanes used to transmit the dummy bytes * @dummy.buswidth: number of IO lanes used to transmit the dummy bytes
* @dummy.dtr: whether the dummy bytes should be sent in DTR mode or not
* @data.buswidth: number of IO lanes used to send/receive the data * @data.buswidth: number of IO lanes used to send/receive the data
* @data.dtr: whether the data should be sent in DTR mode or not
* @data.dir: direction of the transfer * @data.dir: direction of the transfer
* @data.nbytes: number of data bytes to send/receive. Can be zero if the * @data.nbytes: number of data bytes to send/receive. Can be zero if the
* operation does not involve transferring data * operation does not involve transferring data
...@@ -91,22 +95,26 @@ enum spi_mem_data_dir { ...@@ -91,22 +95,26 @@ enum spi_mem_data_dir {
struct spi_mem_op { struct spi_mem_op {
struct { struct {
u8 buswidth; u8 buswidth;
u8 dtr : 1;
u8 opcode; u8 opcode;
} cmd; } cmd;
struct { struct {
u8 nbytes; u8 nbytes;
u8 buswidth; u8 buswidth;
u8 dtr : 1;
u64 val; u64 val;
} addr; } addr;
struct { struct {
u8 nbytes; u8 nbytes;
u8 buswidth; u8 buswidth;
u8 dtr : 1;
} dummy; } dummy;
struct { struct {
u8 buswidth; u8 buswidth;
u8 dtr : 1;
enum spi_mem_data_dir dir; enum spi_mem_data_dir dir;
unsigned int nbytes; unsigned int nbytes;
union { union {
......
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