aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-03-16 07:39:52 +0000
committerJohn Crispin <john@openwrt.org>2015-03-16 07:39:52 +0000
commit257671615b5a915e7fe5767990487bbccaf2b4a1 (patch)
tree959a849b8ece8315d25df194fa68a7a79b0ff5f0 /target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
parent7648d80c901faedb43f296411e9686d7e9eda592 (diff)
downloadupstream-257671615b5a915e7fe5767990487bbccaf2b4a1.tar.gz
upstream-257671615b5a915e7fe5767990487bbccaf2b4a1.tar.bz2
upstream-257671615b5a915e7fe5767990487bbccaf2b4a1.zip
lantiq: drop 3.14 support
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 44812
Diffstat (limited to 'target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch')
-rw-r--r--target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
deleted file mode 100644
index 4c010f8282..0000000000
--- a/target/linux/lantiq/patches-3.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4400e1f593ea40a51912128adb4f53d59e62cad8 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Wed, 10 Sep 2014 22:40:18 +0200
-Subject: [PATCH 22/36] 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 | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -1105,6 +1105,10 @@ static int m25p_probe(struct spi_device
- struct mtd_part_parser_data ppdata;
- struct device_node *np = spi->dev.of_node;
- int ret;
-+ const char __maybe_unused *of_mtd_name = NULL;
-+
-+ of_property_read_string(spi->dev.of_node,
-+ "linux,mtd-name", &of_mtd_name);
-
- /* Platform data helps sort out which chip type we have, as
- * well as how this board partitions it. If we don't have
-@@ -1177,6 +1181,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);
-