mtd: spinand: Use more specific naming for the write enable/disable op

SPI operations have been initially described through macros implicitly
implying the use of a single SPI SDR bus. Macros for supporting dual and
quad I/O transfers have been added on top, generally inspired by vendor
naming, followed by DTR operations. Soon we might see octal
and even octal DTR operations as well (including the opcode byte).

Let's clarify what the macro really means by describing the expected bus
topology in the write enable/disable macro names.

Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
[Miquel: Fixed conflicts with -next by updating esmt and micron drivers]
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 551df7f..e1c3971 100644 (file)
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -362,7 +362,7 @@ static void spinand_ondie_ecc_save_status(struct nand_device *nand, u8 status)
 
 static int spinand_write_enable_op(struct spinand_device *spinand)
 {
-       struct spi_mem_op op = SPINAND_WR_EN_DIS_OP(true);
+       struct spi_mem_op op = SPINAND_WR_EN_DIS_1S_0_0_OP(true);
 
        return spi_mem_exec_op(spinand->spimem, &op);
 }

diff --git a/drivers/mtd/nand/spi/esmt.c b/drivers/mtd/nand/spi/esmt.c
index a164d82..8e73fa7 100644 (file)
--- a/drivers/mtd/nand/spi/esmt.c
+++ b/drivers/mtd/nand/spi/esmt.c
@@ -137,7 +137,7 @@ static int f50l1g41lb_user_otp_info(struct spinand_device *spinand, size_t len,
 static int f50l1g41lb_otp_lock(struct spinand_device *spinand, loff_t from,
                               size_t len)
 {
-       struct spi_mem_op write_op = SPINAND_WR_EN_DIS_OP(true);
+       struct spi_mem_op write_op = SPINAND_WR_EN_DIS_1S_0_0_OP(true);
        struct spi_mem_op exec_op = SPINAND_PROG_EXEC_OP(0);
        u8 status;
        int ret;

diff --git a/drivers/mtd/nand/spi/micron.c b/drivers/mtd/nand/spi/micron.c
index 691f8a2..e25f769 100644 (file)
--- a/drivers/mtd/nand/spi/micron.c
+++ b/drivers/mtd/nand/spi/micron.c
@@ -251,7 +251,7 @@ static int mt29f2g01abagd_user_otp_info(struct spinand_device *spinand,
 static int mt29f2g01abagd_otp_lock(struct spinand_device *spinand, loff_t from,
                                   size_t len)
 {
-       struct spi_mem_op write_op = SPINAND_WR_EN_DIS_OP(true);
+       struct spi_mem_op write_op = SPINAND_WR_EN_DIS_1S_0_0_OP(true);
        struct spi_mem_op exec_op = SPINAND_PROG_EXEC_OP(0);
        u8 status;
        int ret;

diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h
index d1b9b63..87d8f9f 100644 (file)
--- a/include/linux/mtd/spinand.h
+++ b/include/linux/mtd/spinand.h
@@ -26,7 +26,7 @@
                   SPI_MEM_OP_NO_DUMMY,                                 \
                   SPI_MEM_OP_NO_DATA)
 
-#define SPINAND_WR_EN_DIS_OP(enable)                                   \
+#define SPINAND_WR_EN_DIS_1S_0_0_OP(enable)                                    \
        SPI_MEM_OP(SPI_MEM_OP_CMD((enable) ? 0x06 : 0x04, 1),           \
                   SPI_MEM_OP_NO_ADDR,                                  \
                   SPI_MEM_OP_NO_DUMMY,                                 \