This is a note to let you know that I've just added the patch titled Revert "mtd: spi-nor: macronix: Add support for mx25l51245g" to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-mtd-spi-nor-macronix-add-support-for-mx25l51245g.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 46094049a49be777f12a9589798f7c70b90cd03f Mon Sep 17 00:00:00 2001 From: Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx> Date: Fri, 2 Apr 2021 11:20:30 +0300 Subject: Revert "mtd: spi-nor: macronix: Add support for mx25l51245g" From: Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx> commit 46094049a49be777f12a9589798f7c70b90cd03f upstream. This reverts commit 04b8edad262eec0d153005973dfbdd83423c0dcb. 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: 04b8edad262e ("mtd: spi-nor: macronix: Add support for mx25l51245g") Signed-off-by: Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx> Acked-by: Pratyush Yadav <p.yadav@xxxxxx> Cc: stable@xxxxxxxxxxxxxxx Link: https://lore.kernel.org/r/20210402082031.19055-2-tudor.ambarus@xxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/mtd/spi-nor/macronix.c | 3 --- 1 file changed, 3 deletions(-) --- a/drivers/mtd/spi-nor/macronix.c +++ b/drivers/mtd/spi-nor/macronix.c @@ -73,9 +73,6 @@ static const struct flash_info macronix_ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, - { "mx25l51245g", INFO(0xc2201a, 0, 64 * 1024, 1024, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | - SPI_NOR_4B_OPCODES) }, { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, Patches currently in stable-queue which might be from tudor.ambarus@xxxxxxxxxxxxx are queue-5.10/revert-mtd-spi-nor-macronix-add-support-for-mx25l51245g.patch queue-5.10/mtd-rawnand-atmel-update-ecc_stats.corrected-counter.patch queue-5.10/spi-spi-ti-qspi-free-dma-resources.patch queue-5.10/mtd-spi-nor-core-fix-an-issue-of-releasing-resources-during-read-write.patch