From: John Crispin <john@openwrt.org>
Date: Tue, 29 Jan 2013 11:06:57 +0000 (+0000)
Subject: fix mtd_mp25p80_add_gd25q32_gd25q64.patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c6744513a3eddddf9212d51bf310d25853002149;p=openwrt%2Fstaging%2Fkaloz.git

fix mtd_mp25p80_add_gd25q32_gd25q64.patch

SVN-Revision: 35378
---

diff --git a/target/linux/generic/patches-3.6/010-mtd_mp25p80_add_gd25q32_gd25q64.patch b/target/linux/generic/patches-3.6/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
new file mode 100644
index 0000000000..ddc27b104e
--- /dev/null
+++ b/target/linux/generic/patches-3.6/010-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) },
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
deleted file mode 100644
index ddc27b104e..0000000000
--- a/target/linux/generic/patches-3.6/479-mtd_mp25p80_add_gd25q32_gd25q64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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) },
diff --git a/target/linux/generic/patches-3.7/010-mtd_mp25p80_add_gd25q32_gd25q64.patch b/target/linux/generic/patches-3.7/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
new file mode 100644
index 0000000000..ddc27b104e
--- /dev/null
+++ b/target/linux/generic/patches-3.7/010-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) },
diff --git a/target/linux/generic/patches-3.8/010-mtd_mp25p80_add_gd25q32_gd25q64.patch b/target/linux/generic/patches-3.8/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
new file mode 100644
index 0000000000..ddc27b104e
--- /dev/null
+++ b/target/linux/generic/patches-3.8/010-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) },