Commit 429330cd authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: spinand: Use more specific naming for the get/set feature ops 



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 mean by describing the expected bus
topology in the get/set feature macro names.

Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@linaro.org>
[Miquel: Fixed conflicts with -next by updating macronix driver]
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 2a294fa2

drivers/mtd/nand/spi/core.c

+4 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val)

{

	struct spi_mem_op op = SPINAND_GET_FEATURE_OP(reg,

	struct spi_mem_op op = SPINAND_GET_FEATURE_1S_1S_1S_OP(reg,

						      spinand->scratchbuf);

	int ret;
@@ -36,7 +36,7 @@ static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val) 


int spinand_write_reg_op(struct spinand_device *spinand, u8 reg, u8 val)

{

	struct spi_mem_op op = SPINAND_SET_FEATURE_OP(reg,

	struct spi_mem_op op = SPINAND_SET_FEATURE_1S_1S_1S_OP(reg,

						      spinand->scratchbuf);



	*spinand->scratchbuf = val;
@@ -549,7 +549,7 @@ static int spinand_erase_op(struct spinand_device *spinand, 
int spinand_wait(struct spinand_device *spinand, unsigned long initial_delay_us,

		 unsigned long poll_delay_us, u8 *s)

{

	struct spi_mem_op op = SPINAND_GET_FEATURE_OP(REG_STATUS,

	struct spi_mem_op op = SPINAND_GET_FEATURE_1S_1S_1S_OP(REG_STATUS,

							       spinand->scratchbuf);

	u8 status;

	int ret;

drivers/mtd/nand/spi/gigadevice.c

+2 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static int gd5fxgq4uexxg_ecc_get_status(struct spinand_device *spinand, 
					u8 status)

{

	u8 status2;

	struct spi_mem_op op = SPINAND_GET_FEATURE_OP(GD5FXGQXXEXXG_REG_STATUS2,

	struct spi_mem_op op = SPINAND_GET_FEATURE_1S_1S_1S_OP(GD5FXGQXXEXXG_REG_STATUS2,

						      spinand->scratchbuf);

	int ret;
@@ -228,7 +228,7 @@ static int gd5fxgq5xexxg_ecc_get_status(struct spinand_device *spinand, 
					u8 status)

{

	u8 status2;

	struct spi_mem_op op = SPINAND_GET_FEATURE_OP(GD5FXGQXXEXXG_REG_STATUS2,

	struct spi_mem_op op = SPINAND_GET_FEATURE_1S_1S_1S_OP(GD5FXGQXXEXXG_REG_STATUS2,

						      spinand->scratchbuf);

	int ret;

drivers/mtd/nand/spi/macronix.c

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static int macronix_set_cont_read(struct spinand_device *spinand, bool enable) 
static int macronix_set_read_retry(struct spinand_device *spinand,

					     unsigned int retry_mode)

{

	struct spi_mem_op op = SPINAND_SET_FEATURE_OP(MACRONIX_FEATURE_ADDR_READ_RETRY,

	struct spi_mem_op op = SPINAND_SET_FEATURE_1S_1S_1S_OP(MACRONIX_FEATURE_ADDR_READ_RETRY,

							       spinand->scratchbuf);



	*spinand->scratchbuf = retry_mode;

drivers/mtd/nand/spi/micron.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static const struct mtd_ooblayout_ops micron_4_ooblayout = { 
static int micron_select_target(struct spinand_device *spinand,

				unsigned int target)

{

	struct spi_mem_op op = SPINAND_SET_FEATURE_OP(MICRON_DIE_SELECT_REG,

	struct spi_mem_op op = SPINAND_SET_FEATURE_1S_1S_1S_OP(MICRON_DIE_SELECT_REG,

						      spinand->scratchbuf);



	if (target > 1)

drivers/mtd/nand/spi/toshiba.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int tx58cxgxsxraix_ecc_get_status(struct spinand_device *spinand, 
{

	struct nand_device *nand = spinand_to_nand(spinand);

	u8 mbf = 0;

	struct spi_mem_op op = SPINAND_GET_FEATURE_OP(0x30, spinand->scratchbuf);

	struct spi_mem_op op = SPINAND_GET_FEATURE_1S_1S_1S_OP(0x30, spinand->scratchbuf);



	switch (status & STATUS_ECC_MASK) {

	case STATUS_ECC_NO_BITFLIPS: