mtd: spi-nor: issi: 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-23-e60548861b10@kernel.org
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>

diff --git a/drivers/mtd/spi-nor/issi.c b/drivers/mtd/spi-nor/issi.c
index d31401bcab645d5beb4c3d2390571118caf17cf3..9478f1e61626a5027072d33d8abea09e74284645 100644 (file)
--- a/drivers/mtd/spi-nor/issi.c
+++ b/drivers/mtd/spi-nor/issi.c
@@ -47,44 +47,86 @@ static const struct spi_nor_fixups pm25lv_nor_fixups = {
 };
 
 static const struct flash_info issi_nor_parts[] = {
-       { "is25cd512",  INFO(0x7f9d20, 0, 32 * 1024,   2)
-               NO_SFDP_FLAGS(SECT_4K) },
-       { "is25lq040b", INFO(0x9d4013, 0, 64 * 1024,   8)
-               NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-       { "is25lp016d", INFO(0x9d6015, 0, 64 * 1024,  32)
-               NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-       { "is25lp080d", INFO(0x9d6014, 0, 64 * 1024,  16)
-               NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-       { "is25lp032",  INFO(0x9d6016, 0, 64 * 1024,  64)
-               NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ) },
-       { "is25lp064",  INFO(0x9d6017, 0, 64 * 1024, 128)
-               NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ) },
-       { "is25lp128",  INFO(0x9d6018, 0, 64 * 1024, 256)
-               NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ) },
-       { "is25lp256",  INFO(0x9d6019, 0, 64 * 1024, 0)
-               FIXUP_FLAGS(SPI_NOR_4B_OPCODES)
-               .fixups = &is25lp256_fixups },
-       { "is25wp032",  INFO(0x9d7016, 0, 64 * 1024,  64)
-               NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-       { "is25wp064",  INFO(0x9d7017, 0, 64 * 1024, 128)
-               NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-       { "is25wp128",  INFO(0x9d7018, 0, 64 * 1024, 256)
-               NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-       { "is25wp256", INFO(0x9d7019, 0, 0, 0)
-               FIXUP_FLAGS(SPI_NOR_4B_OPCODES)
-               FLAGS(SPI_NOR_QUAD_PP)
-               .fixups = &is25lp256_fixups },
-
-       { "pm25lv512",   INFO0(32 * 1024,    2)
-               NO_SFDP_FLAGS(SECT_4K)
+       {
+               .id = SNOR_ID(0x7f, 0x9d, 0x20),
+               .name = "is25cd512",
+               .sector_size = SZ_32K,
+               .size = SZ_64K,
+               .no_sfdp_flags = SECT_4K,
+       }, {
+               .id = SNOR_ID(0x9d, 0x40, 0x13),
+               .name = "is25lq040b",
+               .size = SZ_512K,
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
+       }, {
+               .id = SNOR_ID(0x9d, 0x60, 0x15),
+               .name = "is25lp016d",
+               .size = SZ_2M,
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
+       }, {
+               .id = SNOR_ID(0x9d, 0x60, 0x14),
+               .name = "is25lp080d",
+               .size = SZ_1M,
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
+       }, {
+               .id = SNOR_ID(0x9d, 0x60, 0x16),
+               .name = "is25lp032",
+               .size = SZ_4M,
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
+       }, {
+               .id = SNOR_ID(0x9d, 0x60, 0x17),
+               .name = "is25lp064",
+               .size = SZ_8M,
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
+       }, {
+               .id = SNOR_ID(0x9d, 0x60, 0x18),
+               .name = "is25lp128",
+               .size = SZ_16M,
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
+       }, {
+               .id = SNOR_ID(0x9d, 0x60, 0x19),
+               .name = "is25lp256",
+               .fixups = &is25lp256_fixups,
+               .fixup_flags = SPI_NOR_4B_OPCODES,
+       }, {
+               .id = SNOR_ID(0x9d, 0x70, 0x16),
+               .name = "is25wp032",
+               .size = SZ_4M,
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
+       }, {
+               .id = SNOR_ID(0x9d, 0x70, 0x17),
+               .size = SZ_8M,
+               .name = "is25wp064",
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
+       }, {
+               .id = SNOR_ID(0x9d, 0x70, 0x18),
+               .name = "is25wp128",
+               .size = SZ_16M,
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ,
+       }, {
+               .id = SNOR_ID(0x9d, 0x70, 0x19),
+               .name = "is25wp256",
+               .flags = SPI_NOR_QUAD_PP,
+               .fixups = &is25lp256_fixups,
+               .fixup_flags = SPI_NOR_4B_OPCODES,
+       }, {
+               .name = "pm25lv512",
+               .sector_size = SZ_32K,
+               .size = SZ_64K,
+               .no_sfdp_flags = SECT_4K,
                .fixups = &pm25lv_nor_fixups
-       },
-       { "pm25lv010",   INFO0(32 * 1024,    4)
-               NO_SFDP_FLAGS(SECT_4K)
+       }, {
+               .name = "pm25lv010",
+               .sector_size = SZ_32K,
+               .size = SZ_128K,
+               .no_sfdp_flags = SECT_4K,
                .fixups = &pm25lv_nor_fixups
-       },
-       { "pm25lq032",   INFO(0x7f9d46, 0, 64 * 1024,   64)
-               NO_SFDP_FLAGS(SECT_4K) },
+       }, {
+               .id = SNOR_ID(0x7f, 0x9d, 0x46),
+               .name = "pm25lq032",
+               .size = SZ_4M,
+               .no_sfdp_flags = SECT_4K,
+       }
 };
 
 static void issi_nor_default_init(struct spi_nor *nor)