diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-07-09 12:52:18 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-09 12:52:18 +0000 |
commit | f42a1b166f43219853c00dc21f25b0254efbbceb (patch) | |
tree | 8fac5ee67f0a836a95385d15ae8f729d34660b9e /target/linux/ar71xx/patches-3.10/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch | |
parent | f56e62651455e1a7cdae45a4a12d5258e57dbb75 (diff) | |
download | master-187ad058-f42a1b166f43219853c00dc21f25b0254efbbceb.tar.gz master-187ad058-f42a1b166f43219853c00dc21f25b0254efbbceb.tar.bz2 master-187ad058-f42a1b166f43219853c00dc21f25b0254efbbceb.zip |
ar71xx: add linux 3.10
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37214 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.10/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch')
-rw-r--r-- | target/linux/ar71xx/patches-3.10/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-3.10/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch b/target/linux/ar71xx/patches-3.10/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch new file mode 100644 index 0000000000..5da93a4dcd --- /dev/null +++ b/target/linux/ar71xx/patches-3.10/407-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 +@@ -1121,7 +1121,9 @@ static int m25p_probe(struct spi_device + /* partitions should match sector boundaries; and it may be good to + * use readonly partitions for writeprotected sectors (BP2..BP0). + */ +- return mtd_device_parse_register(&flash->mtd, NULL, &ppdata, ++ return mtd_device_parse_register(&flash->mtd, ++ data ? data->part_probes : NULL, ++ &ppdata, + data ? data->parts : NULL, + data ? data->nr_parts : 0); + } +--- 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; + + size_t max_read_len; + /* we'll likely add more ... use JEDEC IDs, etc */ |