Unverified Commit d75c22f3 authored by Tudor Ambarus's avatar Tudor Ambarus
Browse files

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



Rename method to spi_nor_set_4byte_addr_mode_en4b_ex4b and extend its
description. This method is described in JESD216 BFPT[SFDP_DWORD(16)],
BIT(31) and BIT(23).

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


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

drivers/mtd/spi-nor/core.c

+5 −3
Original line number Diff line number Diff line
@@ -508,14 +508,16 @@ int spi_nor_read_cr(struct spi_nor *nor, u8 *cr) 
}



/**

 * spi_nor_set_4byte_addr_mode() - Enter/Exit 4-byte address mode.

 * spi_nor_set_4byte_addr_mode_en4b_ex4b() - Enter/Exit 4-byte address mode

 *			using SPINOR_OP_EN4B/SPINOR_OP_EX4B. Typically used by

 *			Winbond and Macronix.

 * @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 spi_nor_set_4byte_addr_mode(struct spi_nor *nor, bool enable)

int spi_nor_set_4byte_addr_mode_en4b_ex4b(struct spi_nor *nor, bool enable)

{

	int ret;
@@ -556,7 +558,7 @@ int spi_nor_set_4byte_addr_mode_wren_en4b_ex4b(struct spi_nor *nor, bool enable) 
	if (ret)

		return ret;



	ret = spi_nor_set_4byte_addr_mode(nor, enable);

	ret = spi_nor_set_4byte_addr_mode_en4b_ex4b(nor, enable);

	if (ret)

		return ret;

drivers/mtd/spi-nor/core.h

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ void spi_nor_spimem_setup_op(const struct spi_nor *nor, 
			     const enum spi_nor_protocol proto);

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 spi_nor_set_4byte_addr_mode_en4b_ex4b(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);

drivers/mtd/spi-nor/macronix.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static const struct flash_info macronix_nor_parts[] = { 
static void macronix_nor_default_init(struct spi_nor *nor)

{

	nor->params->quad_enable = spi_nor_sr1_bit6_quad_enable;

	nor->params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode;

	nor->params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode_en4b_ex4b;

}



static const struct spi_nor_fixups macronix_nor_fixups = {

drivers/mtd/spi-nor/winbond.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static int winbond_nor_set_4byte_addr_mode(struct spi_nor *nor, bool enable) 
{

	int ret;



	ret = spi_nor_set_4byte_addr_mode(nor, enable);

	ret = spi_nor_set_4byte_addr_mode_en4b_ex4b(nor, enable);

	if (ret || enable)

		return ret;