diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-12-13 11:54:57 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-13 11:54:57 +0000 |
commit | c7e8b5ebbdfa098436945e1721b34562cd488f6f (patch) | |
tree | ecf4a556d01dcd70743862e1ce5853e22c80b59b /target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | |
parent | daeec86fba3fee15045429802f06cdd715c688c6 (diff) | |
download | upstream-c7e8b5ebbdfa098436945e1721b34562cd488f6f.tar.gz upstream-c7e8b5ebbdfa098436945e1721b34562cd488f6f.tar.bz2 upstream-c7e8b5ebbdfa098436945e1721b34562cd488f6f.zip |
lantiq: remove linux 3.10 support
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43685
Diffstat (limited to 'target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch deleted file mode 100644 index 17eef08eb7..0000000000 --- a/target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 65d48cd98505800c6765ff94fc007797e00d466f Mon Sep 17 00:00:00 2001 -From: John Crispin <blogic@openwrt.org> -Date: Tue, 29 Jan 2013 21:11:55 +0100 -Subject: [PATCH 12/34] MTD: m25p80: allow loading mtd name from OF - -In accordance with the physmap flash we should honour the linux,mtd-name -property when deciding what name the mtd device has. - -Signed-off-by: Thomas Langer <thomas.langer@lantiq.com> -Signed-off-by: John Crispin <blogic@openwrt.org> ---- - drivers/mtd/devices/m25p80.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -927,10 +927,13 @@ static int m25p_probe(struct spi_device - unsigned i; - struct mtd_part_parser_data ppdata; - struct device_node __maybe_unused *np = spi->dev.of_node; -+ const char __maybe_unused *of_mtd_name = NULL; - - #ifdef CONFIG_MTD_OF_PARTS - if (!of_device_is_available(np)) - return -ENODEV; -+ of_property_read_string(spi->dev.of_node, -+ "linux,mtd-name", &of_mtd_name); - #endif - - /* Platform data helps sort out which chip type we have, as -@@ -1006,6 +1009,8 @@ static int m25p_probe(struct spi_device - - if (data && data->name) - flash->mtd.name = data->name; -+ else if (of_mtd_name) -+ flash->mtd.name = of_mtd_name; - else - flash->mtd.name = dev_name(&spi->dev); - |