]> git.itanic.dy.fi Git - linux-stable/commitdiff
mtd: spi-nor: atmel: drop duplicate entry
authorMichael Walle <mwalle@kernel.org>
Fri, 8 Sep 2023 10:16:58 +0000 (12:16 +0200)
committerTudor Ambarus <tudor.ambarus@linaro.org>
Tue, 19 Sep 2023 15:59:22 +0000 (18:59 +0300)
The Atmel AT26DF321 and AT25DF321 have the same ID. Both were just
discovered by reading their IDs, that is, there is no probing by name.
Thus only the first one (the AT25DF321) in the list was ever probed.
Luckily, the AT25DF is also the newer series. Drop the AT26DF321.

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

index 18e904962d0e187e759b75f11a29ca4d04d502f3..95f0e139284e59a96d5ee79e1a4a5f693a942418 100644 (file)
@@ -206,13 +206,6 @@ static const struct flash_info atmel_nor_parts[] = {
                .flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
                .no_sfdp_flags = SECT_4K,
                .fixups = &atmel_nor_global_protection_fixups
-       }, {
-               .id = SNOR_ID(0x1f, 0x47, 0x00),
-               .name = "at26df321",
-               .size = SZ_4M,
-               .flags = SPI_NOR_HAS_LOCK | SPI_NOR_SWP_IS_VOLATILE,
-               .no_sfdp_flags = SECT_4K,
-               .fixups = &atmel_nor_global_protection_fixups
        }, {
                .id = SNOR_ID(0x1f, 0x47, 0x01),
                .name = "at25df321a",