aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-01-29 09:46:11 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-01-29 09:46:11 +0000
commit714b2cfef3d4736cfbc62c5f45c7b62f7afa67e1 (patch)
tree3d9d5742bd85e42fb58fab0778cdfa07652dff00 /target/linux/generic
parente252a1492ca6f9830c98106d3c3ae7917446fadc (diff)
downloadupstream-714b2cfef3d4736cfbc62c5f45c7b62f7afa67e1.tar.gz
upstream-714b2cfef3d4736cfbc62c5f45c7b62f7afa67e1.tar.bz2
upstream-714b2cfef3d4736cfbc62c5f45c7b62f7afa67e1.zip
Fix GigaDevice GD25Q32/GD25Q64 SPI Flash bad commit
Fix GigaDevice GD25Q32/GD25Q64 SPI Flash bad commit. The patch was added to "linux/generic/patches-3.6" instead of "target/linux/generic/patches-3.6". I also fixed a missing patch space and refreshed generic patches. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 35367
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.6/479-mtd_mp25p80_add_gd25q32_gd25q64.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.6/479-mtd_mp25p80_add_gd25q32_gd25q64.patch b/target/linux/generic/patches-3.6/479-mtd_mp25p80_add_gd25q32_gd25q64.patch
new file mode 100644
index 0000000000..ddc27b104e
--- /dev/null
+++ b/target/linux/generic/patches-3.6/479-mtd_mp25p80_add_gd25q32_gd25q64.patch
@@ -0,0 +1,13 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -651,6 +651,10 @@
+ /* Everspin */
+ { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2) },
+
++ /* GigaDevice */
++ { "gd25q32", INFO(0xc84016, 0, 64 * 1024, 64, SECT_4K) },
++ { "gd25q64", INFO(0xc84017, 0, 64 * 1024, 128, SECT_4K) },
++
+ /* Intel/Numonyx -- xxxs33b */
+ { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) },
+ { "320s33b", INFO(0x898912, 0, 64 * 1024, 64, 0) },