--- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -509,6 +509,11 @@ static struct flash_info __devinitdata m { "mx25l64", 0xc22017, 0, 64 * 1024, 128, }, { "mx25l128", 0xc22018, 0, 64 * 1024, 256, }, + /* Numonyx -- xxxs33b */ + { "160s33b", 0x898911, 0, 64 * 1024, 64, }, + { "320s33b", 0x898912, 0, 64 * 1024, 128, }, + { "640s33b", 0x898913, 0, 64 * 1024, 256, }, + /* PMC -- pm25x "blocks" are 32K, sectors are 4K */ { "pm25lv512", 0, 32 * 1024, 2, SECT_4K }, { "pm25lv010", 0, 32 * 1024, 4, SECT_4K }, @@ -656,11 +661,12 @@ static int __devinit m25p_probe(struct s dev_set_drvdata(&spi->dev, flash); /* - * Atmel serial flash tend to power up + * Atmel and Intel/Numonyx 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 == 0x89) { write_enable(flash); write_sr(flash, 0); }