mtd: spi-nor: disable protection for Winbond flash at startup

In case the flash was locked at boot time.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 53099209500a896b84df048202feb01b9f54117e..533a0f7da3606c364a1123dcfcca531d7ee81966 100644 (file)
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1194,13 +1194,14 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
        mutex_init(&nor->lock);
 
        /*
-        * Atmel, SST and Intel/Numonyx serial nor tend to power
-        * up with the software protection bits set
+        * Atmel, SST, Intel/Numonyx, and others serial NOR tend to power up
+        * with the software protection bits set
         */
 
        if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
            JEDEC_MFR(info) == SNOR_MFR_INTEL ||
-           JEDEC_MFR(info) == SNOR_MFR_SST) {
+           JEDEC_MFR(info) == SNOR_MFR_SST ||
+           JEDEC_MFR(info) == SNOR_MFR_WINBOND) {
                write_enable(nor);
                write_sr(nor, 0);
        }