kernel: backport support for w25q64 flash chips - fixes flash detection on new Ubiqui...

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26581 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch
index 6783f6b..3c733be 100644 (file)
--- a/target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.32/102-mtd_m25p80_add_myloader_parser.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -868,6 +868,16 @@ static int __devinit m25p_probe(struct s
+@@ -869,6 +869,16 @@ static int __devinit m25p_probe(struct s
                                        part_probes, &parts, 0);
                }
  

diff --git a/target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch
index 94e1389..05ecd4c 100644 (file)
--- a/target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.32/104-mtd_m25p80_add_redboot_parser.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -878,6 +878,15 @@ static int __devinit m25p_probe(struct s
+@@ -879,6 +879,15 @@ static int __devinit m25p_probe(struct s
                }
  #endif
  

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 79162fa..339999b 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
-@@ -887,6 +887,16 @@ static int __devinit m25p_probe(struct s
+@@ -888,6 +888,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/091-mtd-m25p80-add-w25q64-chip-support.patch b/target/linux/generic-2.6/patches-2.6.32/091-mtd-m25p80-add-w25q64-chip-support.patch
new file mode 100644 (file)
index 0000000..9c3d0fb
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.32/091-mtd-m25p80-add-w25q64-chip-support.patch
@@ -0,0 +1,10 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -690,6 +690,7 @@ static struct flash_info __devinitdata m
+       { "w25x32", 0xef3016, 0, 64 * 1024, 64, SECT_4K, },
+       { "w25q32", 0xef4016, 0, 64 * 1024, 64, SECT_4K, },
+       { "w25x64", 0xef3017, 0, 64 * 1024, 128, SECT_4K, },
++      { "w25q64", 0xef4017, 0, 64 * 1024, 128, SECT_4K, },
+ };
+ 
+ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)