Skip to content

Commit 5a329c4

Browse files
mwalleambarus
authored andcommitted
mtd: spi-nor: esmt: convert flash_info to new format
The INFOx() macros are going away. Convert the flash_info database to the new format. Signed-off-by: Michael Walle <mwalle@kernel.org> Link: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v3-19-e60548861b10@kernel.org Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
1 parent ca7fb35 commit 5a329c4

1 file changed

Lines changed: 19 additions & 9 deletions

File tree

drivers/mtd/spi-nor/esmt.c

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,25 @@
99
#include "core.h"
1010

1111
static const struct flash_info esmt_nor_parts[] = {
12-
{ "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64)
13-
FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
14-
NO_SFDP_FLAGS(SECT_4K) },
15-
{ "f25l32qa-2s", INFO(0x8c4116, 0, 64 * 1024, 64)
16-
FLAGS(SPI_NOR_HAS_LOCK)
17-
NO_SFDP_FLAGS(SECT_4K) },
18-
{ "f25l64qa", INFO(0x8c4117, 0, 64 * 1024, 128)
19-
FLAGS(SPI_NOR_HAS_LOCK)
20-
NO_SFDP_FLAGS(SECT_4K) },
12+
{
13+
.id = SNOR_ID(0x8c, 0x20, 0x16),
14+
.name = "f25l32pa",
15+
.size = SZ_4M,
16+
.flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
17+
.no_sfdp_flags = SECT_4K,
18+
}, {
19+
.id = SNOR_ID(0x8c, 0x41, 0x16),
20+
.name = "f25l32qa-2s",
21+
.size = SZ_4M,
22+
.flags = SPI_NOR_HAS_LOCK,
23+
.no_sfdp_flags = SECT_4K,
24+
}, {
25+
.id = SNOR_ID(0x8c, 0x41, 0x17),
26+
.name = "f25l64qa",
27+
.size = SZ_8M,
28+
.flags = SPI_NOR_HAS_LOCK,
29+
.no_sfdp_flags = SECT_4K,
30+
}
2131
};
2232

2333
const struct spi_nor_manufacturer spi_nor_esmt = {

0 commit comments

Comments
 (0)