X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Far71xx%2Fpatches-2.6.30%2F106-mtd_m25p80_add_xxxs33b_support.patch;h=5bd20a7692c38626d484f4a7e416c9b7eea6081c;hb=f7245e386e2b66cefa24016c28c54d460b7ac062;hp=4c06173f1b9d159758d932d4080a9441760e7c08;hpb=a826f98491b788b155c4d049d4d48ff5d45aa715;p=openwrt-10.03%2F.git

diff --git a/target/linux/ar71xx/patches-2.6.30/106-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/ar71xx/patches-2.6.30/106-mtd_m25p80_add_xxxs33b_support.patch
index 4c06173f1..5bd20a769 100644
--- a/target/linux/ar71xx/patches-2.6.30/106-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/ar71xx/patches-2.6.30/106-mtd_m25p80_add_xxxs33b_support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -506,6 +506,11 @@ static struct flash_info __devinitdata m
+@@ -509,6 +509,11 @@ static struct flash_info __devinitdata m
  	{ "mx25l64",  0xc22017, 0, 64 * 1024, 128, },
  	{ "mx25l128", 0xc22018, 0, 64 * 1024, 256, },
  
@@ -12,3 +12,18 @@
  	/* 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);
+ 	}