mtd: spi-nor: introduce (temporary) INFO0()

The id will be converted to an own structure. To differentiate between
flashes with and without IDs, introduce a temporary macro INFO0() and
convert all flashes with no ID to use it. The difference between INFO0()
and INFOx() is that the former, doesn't have a pointer to the id
structure. Something which isn't possible to do within the INFOx()
macro.
After the flash_info conversion, that macro will be removed along with
all the other INFOx() macros.

Signed-off-by: Michael Walle <mwalle@kernel.org>
Link: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v3-12-e60548861b10@kernel.org
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>

diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
index 5f7cfdf1e8348483d167be65b21a3bac8c9e7267..b8226492bbd8a29132bbbc48e35f9fc29bdc4783 100644 (file)
--- a/drivers/mtd/spi-nor/core.h
+++ b/drivers/mtd/spi-nor/core.h
@@ -571,6 +571,9 @@ struct flash_info {
        SPI_NOR_ID((_jedec_id), (_ext_id)),                             \
        SPI_NOR_GEOMETRY((_sector_size), (_n_sectors), 0),
 
+#define INFO0(_sector_size, _n_sectors)                                        \
+       SPI_NOR_GEOMETRY((_sector_size), (_n_sectors), 0),
+
 #define INFOB(_jedec_id, _ext_id, _sector_size, _n_sectors, _n_banks)  \
        SPI_NOR_ID((_jedec_id), (_ext_id)),                             \
        SPI_NOR_GEOMETRY((_sector_size), (_n_sectors), (_n_banks)),

diff --git a/drivers/mtd/spi-nor/issi.c b/drivers/mtd/spi-nor/issi.c
index 9d22b799ce94dc7bc17ef73353f37ba87aa7405e..b936a28a85df3a2dd96ea5410eefe044103e6093 100644 (file)
--- a/drivers/mtd/spi-nor/issi.c
+++ b/drivers/mtd/spi-nor/issi.c
@@ -77,11 +77,11 @@ static const struct flash_info issi_nor_parts[] = {
                .fixups = &is25lp256_fixups },
 
        /* PMC */
-       { "pm25lv512",   INFO(0,        0, 32 * 1024,    2)
+       { "pm25lv512",   INFO0(32 * 1024,    2)
                NO_SFDP_FLAGS(SECT_4K)
                .fixups = &pm25lv_nor_fixups
        },
-       { "pm25lv010",   INFO(0,        0, 32 * 1024,    4)
+       { "pm25lv010",   INFO0(32 * 1024,    4)
                NO_SFDP_FLAGS(SECT_4K)
                .fixups = &pm25lv_nor_fixups
        },

diff --git a/drivers/mtd/spi-nor/micron-st.c b/drivers/mtd/spi-nor/micron-st.c
index 6ad080c52ab5d6734dd80d5a58409da5357e4164..5406a3af2ce0c77f2ef2f94fa8b47045617dad56 100644 (file)
--- a/drivers/mtd/spi-nor/micron-st.c
+++ b/drivers/mtd/spi-nor/micron-st.c
@@ -272,15 +272,15 @@ static const struct flash_info st_nor_parts[] = {
        { "m25p64",  INFO(0x202017,  0,  64 * 1024, 128) },
        { "m25p128", INFO(0x202018,  0, 256 * 1024,  64) },
 
-       { "m25p05-nonjedec",  INFO(0, 0,  32 * 1024,   2) },
-       { "m25p10-nonjedec",  INFO(0, 0,  32 * 1024,   4) },
-       { "m25p20-nonjedec",  INFO(0, 0,  64 * 1024,   4) },
-       { "m25p40-nonjedec",  INFO(0, 0,  64 * 1024,   8) },
-       { "m25p80-nonjedec",  INFO(0, 0,  64 * 1024,  16) },
-       { "m25p16-nonjedec",  INFO(0, 0,  64 * 1024,  32) },
-       { "m25p32-nonjedec",  INFO(0, 0,  64 * 1024,  64) },
-       { "m25p64-nonjedec",  INFO(0, 0,  64 * 1024, 128) },
-       { "m25p128-nonjedec", INFO(0, 0, 256 * 1024,  64) },
+       { "m25p05-nonjedec",  INFO0( 32 * 1024,   2) },
+       { "m25p10-nonjedec",  INFO0( 32 * 1024,   4) },
+       { "m25p20-nonjedec",  INFO0( 64 * 1024,   4) },
+       { "m25p40-nonjedec",  INFO0( 64 * 1024,   8) },
+       { "m25p80-nonjedec",  INFO0( 64 * 1024,  16) },
+       { "m25p16-nonjedec",  INFO0( 64 * 1024,  32) },
+       { "m25p32-nonjedec",  INFO0( 64 * 1024,  64) },
+       { "m25p64-nonjedec",  INFO0( 64 * 1024, 128) },
+       { "m25p128-nonjedec", INFO0(256 * 1024,  64) },
 
        { "m45pe10", INFO(0x204011,  0, 64 * 1024,    2) },
        { "m45pe80", INFO(0x204014,  0, 64 * 1024,   16) },