usb: Remove some unused CONFIG settings

[platform/kernel/u-boot.git] / include / spi-mem.h

diff --git a/include/spi-mem.h b/include/spi-mem.h
index 8be3e2b..32ffdc2 100644 (file)
--- a/include/spi-mem.h
+++ b/include/spi-mem.h
@@ -17,6 +17,7 @@ struct udevice;
        {                                                       \
                .buswidth = __buswidth,                         \
                .opcode = __opcode,                             \
+               .nbytes = 1,                                    \
        }
 
 #define SPI_MEM_OP_ADDR(__nbytes, __val, __buswidth)           \
@@ -69,8 +70,11 @@ enum spi_mem_data_dir {
 
 /**
  * struct spi_mem_op - describes a SPI memory operation
+ * @cmd.nbytes: number of opcode bytes (only 1 or 2 are valid). The opcode is
+ *             sent MSB-first.
  * @cmd.buswidth: number of IO lines used to transmit the command
  * @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
  *              does not need to send an address
  * @addr.buswidth: number of IO lines used to transmit the address cycles
@@ -78,33 +82,41 @@ enum spi_mem_data_dir {
  *           Note that only @addr.nbytes are taken into account in this
  *           address value, so users should make sure the value fits in the
  *           assigned number of bytes.
+ * @addr.dtr: whether the address should be sent in DTR mode or not
  * @dummy.nbytes: number of dummy bytes to send after an opcode or address. Can
  *               be zero if the operation does not require 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.dtr: whether the data should be sent in DTR mode or not
  * @data.dir: direction of the transfer
  * @data.buf.in: input buffer
  * @data.buf.out: output buffer
  */
 struct spi_mem_op {
        struct {
+               u8 nbytes;
                u8 buswidth;
-               u8 opcode;
+               u8 dtr : 1;
+               u16 opcode;
        } cmd;
 
        struct {
                u8 nbytes;
                u8 buswidth;
+               u8 dtr : 1;
                u64 val;
        } addr;
 
        struct {
                u8 nbytes;
                u8 buswidth;
+               u8 dtr : 1;
        } dummy;
 
        struct {
                u8 buswidth;
+               u8 dtr : 1;
                enum spi_mem_data_dir dir;
                unsigned int nbytes;
                /* buf.{in,out} must be DMA-able. */
@@ -222,7 +234,7 @@ spi_controller_dma_map_mem_op_data(struct spi_controller *ctlr,
                                   const struct spi_mem_op *op,
                                   struct sg_table *sg)
 {
-       return -ENOTSUPP;
+       return -ENOSYS;
 }
 
 static inline void
@@ -237,6 +249,11 @@ spi_controller_dma_unmap_mem_op_data(struct spi_controller *ctlr,
 int spi_mem_adjust_op_size(struct spi_slave *slave, struct spi_mem_op *op);
 
 bool spi_mem_supports_op(struct spi_slave *slave, const struct spi_mem_op *op);
+bool spi_mem_dtr_supports_op(struct spi_slave *slave,
+                            const struct spi_mem_op *op);
+
+bool spi_mem_default_supports_op(struct spi_slave *slave,
+                                const struct spi_mem_op *op);
 
 int spi_mem_exec_op(struct spi_slave *slave, const struct spi_mem_op *op);