From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 13 Jan 2010 06:52:12 +0000 (+0000)
Subject: ar71xx: fix 320S33B flash chip support
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=29653e24671ed2a0f8f6000fb27c1caa1d229194;p=openwrt%2Fstaging%2Fnbd.git

ar71xx: fix 320S33B flash chip support

SVN-Revision: 19114
---

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 68f17596fe..5bd20a7692 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
@@ -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);
+ 	}
diff --git a/target/linux/ar71xx/patches-2.6.30/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.30/109-mtd-wrt160nl-trx-parser.patch
index 749c1d70dc..5696d39651 100644
--- a/target/linux/ar71xx/patches-2.6.30/109-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-2.6.30/109-mtd-wrt160nl-trx-parser.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -751,6 +751,16 @@ static int __devinit m25p_probe(struct s
+@@ -752,6 +752,16 @@ static int __devinit m25p_probe(struct s
  					part_probes, &parts, 0);
  		}
  #endif
diff --git a/target/linux/ar71xx/patches-2.6.31/106-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/ar71xx/patches-2.6.31/106-mtd_m25p80_add_xxxs33b_support.patch
index e4e01637d6..dfd855a499 100644
--- a/target/linux/ar71xx/patches-2.6.31/106-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/ar71xx/patches-2.6.31/106-mtd_m25p80_add_xxxs33b_support.patch
@@ -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 },
+@@ -660,11 +665,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);
+ 	}
diff --git a/target/linux/ar71xx/patches-2.6.31/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.31/109-mtd-wrt160nl-trx-parser.patch
index 4ab53a48d0..ccf4b66b60 100644
--- a/target/linux/ar71xx/patches-2.6.31/109-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-2.6.31/109-mtd-wrt160nl-trx-parser.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -755,6 +755,16 @@ static int __devinit m25p_probe(struct s
+@@ -756,6 +756,16 @@ static int __devinit m25p_probe(struct s
  					part_probes, &parts, 0);
  		}
  #endif
diff --git a/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch
index 01be5dbb4e..8f1a842beb 100644
--- a/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch
@@ -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 },
+@@ -789,11 +794,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);
+ 	}
diff --git a/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch
index 4136db8e9a..b4eab674a9 100644
--- a/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -889,6 +889,16 @@ static int __devinit m25p_probe(struct s
+@@ -890,6 +890,16 @@ static int __devinit m25p_probe(struct s
  					part_probes, &parts, 0);
  		}
  #endif