Unverified Commit 288df437 authored by Tudor Ambarus's avatar Tudor Ambarus
Browse files

mtd: spi-nor: core: Update name and description of micron_st_nor_set_4byte_addr_mode 



Rename method to spi_nor_set_4byte_addr_mode_wren_en4b_ex4b and extend
its description. This method is described in JESD216 BFPT[SFDP_DWORD(16)],
BIT(30) and BIT(22).

Reviewed-by: default avatarMichael Walle <michael@walle.cc>
Link: https://lore.kernel.org/r/20230331074606.3559258-3-tudor.ambarus@linaro.org


Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@linaro.org>
parent 076aa4ea

drivers/mtd/spi-nor/core.c

+4 −3
Original line number Diff line number Diff line
@@ -539,15 +539,16 @@ int spi_nor_set_4byte_addr_mode(struct spi_nor *nor, bool enable) 
}



/**

 * micron_st_nor_set_4byte_addr_mode() - Set 4-byte address mode for ST and

 * Micron flashes.

 * spi_nor_set_4byte_addr_mode_wren_en4b_ex4b() - Set 4-byte address mode using

 * SPINOR_OP_WREN followed by SPINOR_OP_EN4B or SPINOR_OP_EX4B. Typically used

 * by ST and Micron flashes.

 * @nor:	pointer to 'struct spi_nor'.

 * @enable:	true to enter the 4-byte address mode, false to exit the 4-byte

 *		address mode.

 *

 * Return: 0 on success, -errno otherwise.

 */

int micron_st_nor_set_4byte_addr_mode(struct spi_nor *nor, bool enable)

int spi_nor_set_4byte_addr_mode_wren_en4b_ex4b(struct spi_nor *nor, bool enable)

{

	int ret;

drivers/mtd/spi-nor/core.h

+2 −1
Original line number Diff line number Diff line
@@ -648,7 +648,8 @@ void spi_nor_spimem_setup_op(const struct spi_nor *nor, 
int spi_nor_write_enable(struct spi_nor *nor);

int spi_nor_write_disable(struct spi_nor *nor);

int spi_nor_set_4byte_addr_mode(struct spi_nor *nor, bool enable);

int micron_st_nor_set_4byte_addr_mode(struct spi_nor *nor, bool enable);

int spi_nor_set_4byte_addr_mode_wren_en4b_ex4b(struct spi_nor *nor,

					       bool enable);

int spi_nor_wait_till_ready(struct spi_nor *nor);

int spi_nor_global_block_unlock(struct spi_nor *nor);

int spi_nor_prep_and_lock(struct spi_nor *nor);

drivers/mtd/spi-nor/micron-st.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static void micron_st_nor_default_init(struct spi_nor *nor) 
	nor->flags |= SNOR_F_HAS_LOCK;

	nor->flags &= ~SNOR_F_HAS_16BIT_SR;

	nor->params->quad_enable = NULL;

	nor->params->set_4byte_addr_mode = micron_st_nor_set_4byte_addr_mode;

	nor->params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode_wren_en4b_ex4b;

}



static void micron_st_nor_late_init(struct spi_nor *nor)