mtd: m25p80: add support for the Intel/Numonyx {16,32,64}0S33B SPI flash chips

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 21d866c31bb9..8120cf31ef65 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -645,6 +645,11 @@ static const struct spi_device_id m25p_ids[] = {
         { "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
         { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
 
+        /* Intel/Numonyx -- xxxs33b */
+        { "160s33b",  INFO(0x898911, 0, 64 * 1024,  32, 0) },
+        { "320s33b",  INFO(0x898912, 0, 64 * 1024,  64, 0) },
+        { "640s33b",  INFO(0x898913, 0, 64 * 1024, 128, 0) },
+
         /* Macronix */
         { "mx25l4005a",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },
         { "mx25l8005",   INFO(0xc22014, 0, 64 * 1024,  16, 0) },
@@ -834,11 +839,12 @@ static int __devinit m25p_probe(struct spi_device *spi)
         dev_set_drvdata(&spi->dev, flash);
 
         /*
-         * Atmel and SST serial flash tend to power
+         * Atmel, SST and Intel/Numonyx serial flash tend to power
          * up with the software protection bits set
          */
 
         if (info->jedec_id >> 16 == 0x1f ||
+            info->jedec_id >> 16 == 0x89 ||
             info->jedec_id >> 16 == 0xbf) {
                 write_enable(flash);
                 write_sr(flash, 0);