summaryrefslogtreecommitdiff
path: root/drivers/mtd/devices
diff options
context:
space:
mode:
authorGraf Yang <graf.yang@analog.com>2009-09-24 19:46:22 (GMT)
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-09-24 19:52:29 (GMT)
commitea60658a08f8f3511a70587b27f12cd7e0ac5ae3 (patch)
treeba4634984e721a175aba31e6b3e0fe7a20ab5548 /drivers/mtd/devices
parentde19d02b731478877ce8b1ccf371c2b2142ac80e (diff)
downloadlinux-fsl-qoriq-ea60658a08f8f3511a70587b27f12cd7e0ac5ae3.tar.xz
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@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/devices')
-rw-r--r--drivers/mtd/devices/m25p80.c7
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);
}