diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2011-12-03 18:13:18 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2011-12-03 18:13:18 +0000 |
| commit | b6c404e141ef7bc36362b466eda678c784659142 (patch) | |
| tree | d36ca0c893d18b0359f813fd726a4c5a46e5a6af /target/linux | |
| parent | c7c70fbb89f0f14a69c168d9919458afa34f734d (diff) | |
| download | upstream-b6c404e141ef7bc36362b466eda678c784659142.tar.gz upstream-b6c404e141ef7bc36362b466eda678c784659142.tar.bz2 upstream-b6c404e141ef7bc36362b466eda678c784659142.zip | |
ar71xx: allow to pass part_probe types to the m25p80 driver
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29411 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
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 |