[PATCH] mtd: spi-nor: fix options for mx66l51235f

[Alexander Amelkin <a.amelkin@xxxxxxxxx>]

Currently in spi-nor driver there is a line for mx66l51235l.
According to Macronix site, there is no such part number. The chip
detected as such is actually mx66l51235f. Hence, this commit renames
the chip.

According to the datasheet for mx66l51235f, "The device default is in
24-bit address mode" (section 9-10). Having option SPI_NOR_4B_OPCODES
makes the code act as if the device was already in 4B mode and didn't
need the EN4B command. That prevents this chip from functioning on
systems where the boot loader left the chip in 3B mode (e.g. if the
chip wasn't used during the boot process).

Hence, this commit removes the SPI_NOR_4B_OPCODES option for
mx66l51235f (added previously by commit d342b6a973af).

Cc: Marek Vasut <marek.vasut@xxxxxxxxx>
Cc: <linux-mtd@xxxxxxxxxxxxxxxxxxx>
Cc: <openbmc@xxxxxxxxxxxxxxxx>
Cc: Joel Stanley <joel@xxxxxxxxx>
Fixes: d342b6a973af ("mtd: spi-nor: enable 4B opcodes for mx66l51235l")
Signed-off-by: Alexander Amelkin <a.amelkin@xxxxxxxxx>
Reviewed-by: Cédric Le Goater <clg@xxxxxxxx>
---
 drivers/mtd/spi-nor/spi-nor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index f028277..c5ef85e 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1091,7 +1091,7 @@ static const struct flash_info spi_nor_ids[] = {
 	{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 	{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
 	{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
-	{ "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
+	{ "mx66l51235f", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 	{ "mx66u51235f", INFO(0xc2253a, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
 	{ "mx66l1g45g",  INFO(0xc2201b, 0, 64 * 1024, 2048, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 	{ "mx66l1g55g",  INFO(0xc2261b, 0, 64 * 1024, 2048, SPI_NOR_QUAD_READ) },
-- 
2.7.4


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/