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

diff --git a/drivers/mtd/spi-nor/everspin.c b/drivers/mtd/spi-nor/everspin.c
index d02c32f2f7adc7ea4016fdf7e99436f20fef9d20..5f321e24ae7d44ed6946dba0e738918f202270ab 100644 (file)
--- a/drivers/mtd/spi-nor/everspin.c
+++ b/drivers/mtd/spi-nor/everspin.c
@@ -9,10 +9,29 @@
 #include "core.h"
 
 static const struct flash_info everspin_nor_parts[] = {
-       { "mr25h128", CAT25_INFO(16 * 1024, 1, 256, 2) },
-       { "mr25h256", CAT25_INFO(32 * 1024, 1, 256, 2) },
-       { "mr25h10",  CAT25_INFO(128 * 1024, 1, 256, 3) },
-       { "mr25h40",  CAT25_INFO(512 * 1024, 1, 256, 3) },
+       {
+               .name = "mr25h128",
+               .size = SZ_16K,
+               .sector_size = SZ_16K,
+               .addr_nbytes = 2,
+               .flags = SPI_NOR_NO_ERASE | SPI_NOR_NO_FR,
+       }, {
+               .name = "mr25h256",
+               .size = SZ_32K,
+               .sector_size = SZ_32K,
+               .addr_nbytes = 2,
+               .flags = SPI_NOR_NO_ERASE | SPI_NOR_NO_FR,
+       }, {
+               .name = "mr25h10",
+               .size = SZ_128K,
+               .sector_size = SZ_128K,
+               .flags = SPI_NOR_NO_ERASE | SPI_NOR_NO_FR,
+       }, {
+               .name = "mr25h40",
+               .size = SZ_512K,
+               .sector_size = SZ_512K,
+               .flags = SPI_NOR_NO_ERASE | SPI_NOR_NO_FR,
+       }
 };
 
 const struct spi_nor_manufacturer spi_nor_everspin = {