mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
mtd: spi-nor: micron-st: unify function names
To avoid name clashes unify all the function and static object names and use one of the following prefixes which should be sufficiently unique: - <vendor>_nor_ - <flash_family>_nor_ - <flash_part>_ There are no functional changes. Signed-off-by: Michael Walle <michael@walle.cc> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Acked-by: Pratyush Yadav <p.yadav@ti.com> Link: https://lore.kernel.org/r/20220223134358.1914798-12-michael@walle.cc
This commit is contained in:
parent
0757201a1d
commit
c9d5cdf4bf
1 changed files with 17 additions and 17 deletions
|
@ -17,7 +17,7 @@
|
|||
#define SPINOR_MT_OCT_DTR 0xe7 /* Enable Octal DTR. */
|
||||
#define SPINOR_MT_EXSPI 0xff /* Enable Extended SPI (default) */
|
||||
|
||||
static int spi_nor_micron_octal_dtr_enable(struct spi_nor *nor, bool enable)
|
||||
static int micron_st_nor_octal_dtr_enable(struct spi_nor *nor, bool enable)
|
||||
{
|
||||
struct spi_mem_op op;
|
||||
u8 *buf = nor->bouncebuf;
|
||||
|
@ -102,7 +102,7 @@ static int spi_nor_micron_octal_dtr_enable(struct spi_nor *nor, bool enable)
|
|||
|
||||
static void mt35xu512aba_default_init(struct spi_nor *nor)
|
||||
{
|
||||
nor->params->octal_dtr_enable = spi_nor_micron_octal_dtr_enable;
|
||||
nor->params->octal_dtr_enable = micron_st_nor_octal_dtr_enable;
|
||||
}
|
||||
|
||||
static void mt35xu512aba_post_sfdp_fixup(struct spi_nor *nor)
|
||||
|
@ -130,7 +130,7 @@ static const struct spi_nor_fixups mt35xu512aba_fixups = {
|
|||
.post_sfdp = mt35xu512aba_post_sfdp_fixup,
|
||||
};
|
||||
|
||||
static const struct flash_info micron_parts[] = {
|
||||
static const struct flash_info micron_nor_parts[] = {
|
||||
{ "mt35xu512aba", INFO(0x2c5b1a, 0, 128 * 1024, 512)
|
||||
FLAGS(USE_FSR)
|
||||
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_OCTAL_READ |
|
||||
|
@ -143,7 +143,7 @@ static const struct flash_info micron_parts[] = {
|
|||
FIXUP_FLAGS(SPI_NOR_4B_OPCODES) },
|
||||
};
|
||||
|
||||
static const struct flash_info st_parts[] = {
|
||||
static const struct flash_info st_nor_parts[] = {
|
||||
{ "n25q016a", INFO(0x20bb15, 0, 64 * 1024, 32)
|
||||
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ) },
|
||||
{ "n25q032", INFO(0x20ba16, 0, 64 * 1024, 64)
|
||||
|
@ -250,15 +250,15 @@ static const struct flash_info st_parts[] = {
|
|||
};
|
||||
|
||||
/**
|
||||
* st_micron_set_4byte_addr_mode() - Set 4-byte address mode for ST and Micron
|
||||
* flashes.
|
||||
* micron_st_nor_set_4byte_addr_mode() - Set 4-byte address mode for 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.
|
||||
*/
|
||||
static int st_micron_set_4byte_addr_mode(struct spi_nor *nor, bool enable)
|
||||
static int micron_st_nor_set_4byte_addr_mode(struct spi_nor *nor, bool enable)
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
@ -273,28 +273,28 @@ static int st_micron_set_4byte_addr_mode(struct spi_nor *nor, bool enable)
|
|||
return spi_nor_write_disable(nor);
|
||||
}
|
||||
|
||||
static void micron_st_default_init(struct spi_nor *nor)
|
||||
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 = st_micron_set_4byte_addr_mode;
|
||||
nor->params->set_4byte_addr_mode = micron_st_nor_set_4byte_addr_mode;
|
||||
}
|
||||
|
||||
static const struct spi_nor_fixups micron_st_fixups = {
|
||||
.default_init = micron_st_default_init,
|
||||
static const struct spi_nor_fixups micron_st_nor_fixups = {
|
||||
.default_init = micron_st_nor_default_init,
|
||||
};
|
||||
|
||||
const struct spi_nor_manufacturer spi_nor_micron = {
|
||||
.name = "micron",
|
||||
.parts = micron_parts,
|
||||
.nparts = ARRAY_SIZE(micron_parts),
|
||||
.fixups = µn_st_fixups,
|
||||
.parts = micron_nor_parts,
|
||||
.nparts = ARRAY_SIZE(micron_nor_parts),
|
||||
.fixups = µn_st_nor_fixups,
|
||||
};
|
||||
|
||||
const struct spi_nor_manufacturer spi_nor_st = {
|
||||
.name = "st",
|
||||
.parts = st_parts,
|
||||
.nparts = ARRAY_SIZE(st_parts),
|
||||
.fixups = µn_st_fixups,
|
||||
.parts = st_nor_parts,
|
||||
.nparts = ARRAY_SIZE(st_nor_parts),
|
||||
.fixups = µn_st_nor_fixups,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue