mtd: spinand: Decouple write enable and write disable operations

miquelraynal · miquelraynal · commit c0ba929cf7a9 · 2026-01-29T20:21:40.000+01:00
In order to introduce templates for all operations and not only for page
helpers (in order to introduce octal DDR support), decouple the WR_EN
and WR_DIS operations into two separate macros.

Adapt the callers accordingly.

There is no functional change.

Reviewed-by: Tudor Ambarus &lt;tudor.ambarus@linaro.org&gt;
Signed-off-by: Miquel Raynal &lt;miquel.raynal@bootlin.com&gt;
diff --git 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)
 
 int spinand_write_enable_op(struct spinand_device *spinand)
 {
-	struct spi_mem_op op = SPINAND_WR_EN_DIS_1S_0_0_OP(true);
+	struct spi_mem_op op = SPINAND_WR_EN_1S_0_0_OP;
 
 	return spi_mem_exec_op(spinand->spimem, &op);
 }
diff --git a/drivers/mtd/nand/spi/esmt.c b/drivers/mtd/nand/spi/esmt.c
@@ -138,7 +138,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_1S_0_0_OP(true);
+	struct spi_mem_op write_op = SPINAND_WR_EN_1S_0_0_OP;
 	struct spi_mem_op exec_op = SPINAND_PROG_EXEC_1S_1S_0_OP(0);
 	u8 status;
 	int ret;
diff --git 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_1S_0_0_OP(true);
+	struct spi_mem_op write_op = SPINAND_WR_EN_1S_0_0_OP;
 	struct spi_mem_op exec_op = SPINAND_PROG_EXEC_1S_1S_0_OP(0);
 	u8 status;
 	int ret;
diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h
@@ -26,8 +26,14 @@
 		   SPI_MEM_OP_NO_DUMMY,					\
 		   SPI_MEM_OP_NO_DATA)
 
-#define SPINAND_WR_EN_DIS_1S_0_0_OP(enable)					\
-	SPI_MEM_OP(SPI_MEM_OP_CMD((enable) ? 0x06 : 0x04, 1),		\
+#define SPINAND_WR_EN_1S_0_0_OP						\
+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x06, 1),				\
+		   SPI_MEM_OP_NO_ADDR,					\
+		   SPI_MEM_OP_NO_DUMMY,					\
+		   SPI_MEM_OP_NO_DATA)
+
+#define SPINAND_WR_DIS_1S_0_0_OP					\
+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x04, 1),				\
 		   SPI_MEM_OP_NO_ADDR,					\
 		   SPI_MEM_OP_NO_DUMMY,					\
 		   SPI_MEM_OP_NO_DATA)

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ static void spinand_ondie_ecc_save_status(struct nand_device *nand, u8 status)`
`362`	`362`
`363`	`363`	`int spinand_write_enable_op(struct spinand_device *spinand)`
`364`	`364`	`{`
`365`		`- struct spi_mem_op op = SPINAND_WR_EN_DIS_1S_0_0_OP(true);`
	`365`	`+ struct spi_mem_op op = SPINAND_WR_EN_1S_0_0_OP;`
`366`	`366`
`367`	`367`	`return spi_mem_exec_op(spinand->spimem, &op);`
`368`	`368`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ static int f50l1g41lb_user_otp_info(struct spinand_device *spinand, size_t len,`
`138`	`138`	`static int f50l1g41lb_otp_lock(struct spinand_device *spinand, loff_t from,`
`139`	`139`	`size_t len)`
`140`	`140`	`{`
`141`		`- struct spi_mem_op write_op = SPINAND_WR_EN_DIS_1S_0_0_OP(true);`
	`141`	`+ struct spi_mem_op write_op = SPINAND_WR_EN_1S_0_0_OP;`
`142`	`142`	`struct spi_mem_op exec_op = SPINAND_PROG_EXEC_1S_1S_0_OP(0);`
`143`	`143`	`u8 status;`
`144`	`144`	`int ret;`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ static int mt29f2g01abagd_user_otp_info(struct spinand_device *spinand,`
`251`	`251`	`static int mt29f2g01abagd_otp_lock(struct spinand_device *spinand, loff_t from,`
`252`	`252`	`size_t len)`
`253`	`253`	`{`
`254`		`- struct spi_mem_op write_op = SPINAND_WR_EN_DIS_1S_0_0_OP(true);`
	`254`	`+ struct spi_mem_op write_op = SPINAND_WR_EN_1S_0_0_OP;`
`255`	`255`	`struct spi_mem_op exec_op = SPINAND_PROG_EXEC_1S_1S_0_OP(0);`
`256`	`256`	`u8 status;`
`257`	`257`	`int ret;`