Skip to content

Commit 4609404

Browse files
committed
Revert "mtd: spi-nor: macronix: Add support for mx25l51245g"
This reverts commit 04b8eda. mx25l51245g and mx66l51235l have the same flash ID. The flash detection returns the first entry in the flash_info array that matches the flash ID that was read, thus for the 0xc2201a ID, mx25l51245g was always hit, introducing a regression for mx66l51235l. If one wants to differentiate the flash names, a better fix would be to differentiate between the two at run-time, depending on SFDP, and choose the correct name from a list of flash names, depending on the SFDP differentiator. Fixes: 04b8eda ("mtd: spi-nor: macronix: Add support for mx25l51245g") Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Acked-by: Pratyush Yadav <p.yadav@ti.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20210402082031.19055-2-tudor.ambarus@microchip.com
1 parent be94215 commit 4609404

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

drivers/mtd/spi-nor/macronix.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ static const struct flash_info macronix_parts[] = {
7272
SECT_4K | SPI_NOR_DUAL_READ |
7373
SPI_NOR_QUAD_READ) },
7474
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
75-
{ "mx25l51245g", INFO(0xc2201a, 0, 64 * 1024, 1024,
76-
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
77-
SPI_NOR_4B_OPCODES) },
7875
{ "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024,
7976
SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
8077
SPI_NOR_4B_OPCODES) },

0 commit comments

Comments
 (0)