mtd: m25p80: disable SST software protection bits by default

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=ea60658a08f8f3511a70587b27f12cd7e0ac5ae3
Commit:     ea60658a08f8f3511a70587b27f12cd7e0ac5ae3
Parent:     de19d02b731478877ce8b1ccf371c2b2142ac80e
Author:     Graf Yang <graf.yang at analog.com>
AuthorDate: Thu Sep 24 15:46:22 2009 -0400
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Thu Sep 24 12:52:29 2009 -0700

    mtd: m25p80: disable SST software protection bits by default
    
    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 at analog.com>
    Signed-off-by: Mike Frysinger <vapier at gentoo.org>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/devices/m25p80.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 379c316..933267a 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -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);
 	}