mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-12 23:42:26 +03:00
2bbe78f8f6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22861 3c298f89-4303-0410-b956-a3cf2f4a3e73
29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
--- a/drivers/mtd/devices/m25p80.c
|
|
+++ b/drivers/mtd/devices/m25p80.c
|
|
@@ -651,6 +651,11 @@ static const struct spi_device_id m25p_i
|
|
{ "en25p32", INFO(0x1c2016, 0, 64 * 1024, 64, 0) },
|
|
{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
|
|
|
|
+ /* 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) },
|
|
+
|
|
/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
|
|
{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
|
|
{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
|
|
@@ -835,11 +840,12 @@ static int __devinit m25p_probe(struct s
|
|
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);
|