mtd: spi-nor: eon: sort flash_info database

The flash ID is the new primary key into our database. Sort the entry by
it. Keep the most specific ones first, because there might be ID
collisions between shorter and longer ones.

Signed-off-by: Michael Walle <mwalle@kernel.org>
Link: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v3-32-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 ba09cb6c2abd929b3115012ea981d300e188fe45..c1ddf662f782777f120df30c2e03804d9e5c3fab 100644 (file)
--- a/drivers/mtd/spi-nor/eon.c
+++ b/drivers/mtd/spi-nor/eon.c
@@ -10,32 +10,37 @@
 
 static const struct flash_info eon_nor_parts[] = {
        {
-               .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, 0x14),
+               .name = "en25q80a",
+               .size = SZ_1M,
+               .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
+       }, {
+               .id = SNOR_ID(0x1c, 0x30, 0x16),
+               .name = "en25q32b",
+               .size = SZ_4M,
        }, {
                .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, 0x31, 0x16),
+               .name = "en25f32",
+               .size = SZ_4M,
+               .no_sfdp_flags = SECT_4K,
+       }, {
+               .name = "en25s64",
+               .id = SNOR_ID(0x1c, 0x38, 0x17),
+               .size = SZ_8M,
+               .no_sfdp_flags = SECT_4K,
        }, {
                .id = SNOR_ID(0x1c, 0x70, 0x15),
                .name = "en25qh16",
@@ -57,11 +62,6 @@ static const struct flash_info eon_nor_parts[] = {
        }, {
                .id = SNOR_ID(0x1c, 0x70, 0x19),
                .name = "en25qh256",
-       }, {
-               .name = "en25s64",
-               .id = SNOR_ID(0x1c, 0x38, 0x17),
-               .size = SZ_8M,
-               .no_sfdp_flags = SECT_4K,
        },
 };