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

diff --git a/drivers/mtd/spi-nor/eon.c b/drivers/mtd/spi-nor/eon.c
index 4848ffe8b38fee00d8df08d7f971429b308d8587..ba09cb6c2abd929b3115012ea981d300e188fe45 100644 (file)
--- a/drivers/mtd/spi-nor/eon.c
+++ b/drivers/mtd/spi-nor/eon.c
@@ -9,24 +9,60 @@
 #include "core.h"
 
 static const struct flash_info eon_nor_parts[] = {
-       { "en25f32",    INFO(0x1c3116, 0, 64 * 1024,   64)
-               NO_SFDP_FLAGS(SECT_4K) },
-       { "en25p32",    INFO(0x1c2016, 0, 64 * 1024,   64) },
-       { "en25q32b",   INFO(0x1c3016, 0, 64 * 1024,   64) },
-       { "en25p64",    INFO(0x1c2017, 0, 64 * 1024,  128) },
-       { "en25q64",    INFO(0x1c3017, 0, 64 * 1024,  128)
-               NO_SFDP_FLAGS(SECT_4K) },
-       { "en25q80a",   INFO(0x1c3014, 0, 64 * 1024,   16)
-               NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ) },
-       { "en25qh16",   INFO(0x1c7015, 0, 64 * 1024,   32)
-               NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ) },
-       { "en25qh32",   INFO(0x1c7016, 0, 64 * 1024,   64) },
-       { "en25qh64",   INFO(0x1c7017, 0, 64 * 1024,  128)
-               NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ) },
-       { "en25qh128",  INFO(0x1c7018, 0, 64 * 1024,  256) },
-       { "en25qh256",  INFO(0x1c7019, 0, 64 * 1024,  0) },
-       { "en25s64",    INFO(0x1c3817, 0, 64 * 1024,  128)
-               NO_SFDP_FLAGS(SECT_4K) },
+       {
+               .id = SNOR_ID(0x1c, 0x31, 0x16),
+               .name = "en25f32",
+               .size = SZ_4M,
+               .no_sfdp_flags = SECT_4K,
+       }, {
+               .id = SNOR_ID(0x1c, 0x20, 0x16),
+               .name = "en25p32",
+               .size = SZ_4M,
+       }, {
+               .id = SNOR_ID(0x1c, 0x30, 0x16),
+               .name = "en25q32b",
+               .size = SZ_4M,
+       }, {
+               .id = SNOR_ID(0x1c, 0x20, 0x17),
+               .name = "en25p64",
+               .size = SZ_8M,
+       }, {
+               .id = SNOR_ID(0x1c, 0x30, 0x17),
+               .name = "en25q64",
+               .size = SZ_8M,
+               .no_sfdp_flags = SECT_4K,
+       }, {
+               .id = SNOR_ID(0x1c, 0x30, 0x14),
+               .name = "en25q80a",
+               .size = SZ_1M,
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
+       }, {
+               .id = SNOR_ID(0x1c, 0x70, 0x15),
+               .name = "en25qh16",
+               .size = SZ_2M,
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
+       }, {
+               .id = SNOR_ID(0x1c, 0x70, 0x16),
+               .name = "en25qh32",
+               .size = SZ_4M,
+       }, {
+               .id = SNOR_ID(0x1c, 0x70, 0x17),
+               .name = "en25qh64",
+               .size = SZ_8M,
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
+       }, {
+               .id = SNOR_ID(0x1c, 0x70, 0x18),
+               .name = "en25qh128",
+               .size = SZ_16M,
+       }, {
+               .id = SNOR_ID(0x1c, 0x70, 0x19),
+               .name = "en25qh256",
+       }, {
+               .name = "en25s64",
+               .id = SNOR_ID(0x1c, 0x38, 0x17),
+               .size = SZ_8M,
+               .no_sfdp_flags = SECT_4K,
+       },
 };
 
 const struct spi_nor_manufacturer spi_nor_eon = {