mtd: m25p80: disable SST software protection bits by default
authorGraf Yang <graf.yang@analog.com>
Thu, 24 Sep 2009 19:46:22 +0000 (15:46 -0400)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Thu, 24 Sep 2009 19:52:29 +0000 (12:52 -0700)
The SST SPI flashes is like Atmel SPI flashes in that the software
protection bits are set by default at power up, so clear them at init
time.

Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/devices/m25p80.c

index 379c316..933267a 100644 (file)
@@ -775,11 +775,12 @@ static int __devinit m25p_probe(struct spi_device *spi)
        dev_set_drvdata(&spi->dev, flash);
 
        /*
-        * Atmel serial flash tend to power up
-        * with the software protection bits set
+        * Atmel and SST serial flash tend to power
+        * up with the software protection bits set
         */
 
-       if (info->jedec_id >> 16 == 0x1f) {
+       if (info->jedec_id >> 16 == 0x1f ||
+           info->jedec_id >> 16 == 0xbf) {
                write_enable(flash);
                write_sr(flash, 0);
        }