[backfire] backport upstream commit f2df1ae3fe8d44d51bd7218a9da9134b83c7531e

Adds support for the Spansion S25FL016K and S25FL064K SPI flash chips.

SVN-Revision: 27767

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 339999b24d9662334552f849f36d422f7df0b196..b4eab674a9d893e19207dd6b72c059bb2d6102be 100644 (file)
--- 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
-@@ -888,6 +888,16 @@ static int __devinit m25p_probe(struct s
+@@ -890,6 +890,16 @@ static int __devinit m25p_probe(struct s
                                        part_probes, &parts, 0);
                }
  #endif

diff --git a/target/linux/generic-2.6/patches-2.6.32/092-mtd-m25p80-add-s25fl-chip-support.patch b/target/linux/generic-2.6/patches-2.6.32/092-mtd-m25p80-add-s25fl-chip-support.patch
new file mode 100644 (file)
index 0000000..7ef929d
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.32/092-mtd-m25p80-add-s25fl-chip-support.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -652,6 +652,8 @@ static struct flash_info __devinitdata m
+       { "s25sl12801", 0x012018, 0x0301, 64 * 1024, 256, },
+       { "s25fl129p0", 0x012018, 0x4d00, 256 * 1024, 64, },
+       { "s25fl129p1", 0x012018, 0x4d01, 64 * 1024, 256, },
++      { "s25fl016k", 0xef4015, 0, 64 * 1024, 32, SECT_4K },
++      { "s25fl064k", 0xef4017, 0, 64 * 1024, 128, SECT_4K },
+ 
+       /* SST -- large erase sizes are "overlays", "sectors" are 4K */
+       { "sst25vf040b", 0xbf258d, 0, 64 * 1024, 8, SECT_4K, },