aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-12-03 18:13:18 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-12-03 18:13:18 +0000
commitc8acd6e01336e62357212e2c05b295bd687de1d3 (patch)
tree7b946d9d602061f068a5ebb227bf5d5fdc364314
parent20483faed099e623b2dcbcf6edde729fd4f46ff5 (diff)
downloadupstream-c8acd6e01336e62357212e2c05b295bd687de1d3.tar.gz
upstream-c8acd6e01336e62357212e2c05b295bd687de1d3.tar.bz2
upstream-c8acd6e01336e62357212e2c05b295bd687de1d3.zip
ar71xx: allow to pass part_probe types to the m25p80 driver
SVN-Revision: 29411
-rw-r--r--target/linux/ar71xx/patches-2.6.39/100-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch23
-rw-r--r--target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch6
-rw-r--r--target/linux/ar71xx/patches-2.6.39/104-mtd_m25p80_add_redboot_parser.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.39/109-mtd-wrt160nl-trx-parser.patch2
4 files changed, 28 insertions, 5 deletions
diff --git a/target/linux/ar71xx/patches-2.6.39/100-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch b/target/linux/ar71xx/patches-2.6.39/100-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
new file mode 100644
index 0000000000..586dcf46a6
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.39/100-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
@@ -0,0 +1,23 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -968,6 +968,10 @@ static int __devinit m25p_probe(struct s
+ part_probes, &parts, 0);
+ }
+
++ if (nr_parts <= 0 && data && data->part_probes)
++ nr_parts = parse_mtd_partitions(&flash->mtd,
++ data->part_probes, &parts, 0);
++
+ if (nr_parts <= 0 && data && data->parts) {
+ parts = data->parts;
+ nr_parts = data->nr_parts;
+--- a/include/linux/spi/flash.h
++++ b/include/linux/spi/flash.h
+@@ -24,6 +24,7 @@ struct flash_platform_data {
+ unsigned int nr_parts;
+
+ char *type;
++ const char **part_probes;
+
+ /* we'll likely add more ... use JEDEC IDs, etc */
+ };
diff --git a/target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch
index 149474bcc1..35c5a07a09 100644
--- a/target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.39/102-mtd_m25p80_add_myloader_parser.patch
@@ -1,8 +1,8 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -968,6 +968,16 @@ static int __devinit m25p_probe(struct s
- part_probes, &parts, 0);
- }
+@@ -972,6 +972,16 @@ static int __devinit m25p_probe(struct s
+ nr_parts = parse_mtd_partitions(&flash->mtd,
+ data->part_probes, &parts, 0);
+#ifdef CONFIG_MTD_MYLOADER_PARTS
+ if (nr_parts <= 0) {
diff --git a/target/linux/ar71xx/patches-2.6.39/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.39/104-mtd_m25p80_add_redboot_parser.patch
index dee3f6cc7d..da6f1e14eb 100644
--- a/target/linux/ar71xx/patches-2.6.39/104-mtd_m25p80_add_redboot_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.39/104-mtd_m25p80_add_redboot_parser.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -978,6 +978,15 @@ static int __devinit m25p_probe(struct s
+@@ -982,6 +982,15 @@ static int __devinit m25p_probe(struct s
}
#endif
diff --git a/target/linux/ar71xx/patches-2.6.39/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.39/109-mtd-wrt160nl-trx-parser.patch
index ea9460ae31..838fe446cb 100644
--- a/target/linux/ar71xx/patches-2.6.39/109-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-2.6.39/109-mtd-wrt160nl-trx-parser.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -987,6 +987,16 @@ static int __devinit m25p_probe(struct s
+@@ -991,6 +991,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
#endif