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>

diff --git a/drivers/mtd/spi-nor/esmt.c b/drivers/mtd/spi-nor/esmt.c
index 12779bec5f992a9cc649a62496342ae1d04e4624..089fcd1aa794eaf520a481318bdaa93fd96f9ea2 100644 (file)
--- a/drivers/mtd/spi-nor/esmt.c
+++ b/drivers/mtd/spi-nor/esmt.c
@@ -9,15 +9,25 @@
 #include "core.h"
 
 static const struct flash_info esmt_nor_parts[] = {
-       { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64)
-               FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE)
-               NO_SFDP_FLAGS(SECT_4K) },
-       { "f25l32qa-2s", INFO(0x8c4116, 0, 64 * 1024, 64)
-               FLAGS(SPI_NOR_HAS_LOCK)
-               NO_SFDP_FLAGS(SECT_4K) },
-       { "f25l64qa", INFO(0x8c4117, 0, 64 * 1024, 128)
-               FLAGS(SPI_NOR_HAS_LOCK)
-               NO_SFDP_FLAGS(SECT_4K) },
+       {
+               .id = SNOR_ID(0x8c, 0x20, 0x16),
+               .name = "f25l32pa",
+               .size = SZ_4M,
+               .flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
+               .no_sfdp_flags = SECT_4K,
+       }, {
+               .id = SNOR_ID(0x8c, 0x41, 0x16),
+               .name = "f25l32qa-2s",
+               .size = SZ_4M,
+               .flags = SPI_NOR_HAS_LOCK,
+               .no_sfdp_flags = SECT_4K,
+       }, {
+               .id = SNOR_ID(0x8c, 0x41, 0x17),
+               .name = "f25l64qa",
+               .size = SZ_8M,
+               .flags = SPI_NOR_HAS_LOCK,
+               .no_sfdp_flags = SECT_4K,
+       }
 };
 
 const struct spi_nor_manufacturer spi_nor_esmt = {