aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-18 15:54:23 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-18 15:54:23 +0000
commite7846156f23b109fd8789d60a4827171b06553a7 (patch)
treef0bddd8d50cf4209c70dcd43e564be8706ae51ce /target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
parent9b4b2b4e17f10492798b14f7bb7e943ad86b4515 (diff)
downloadupstream-e7846156f23b109fd8789d60a4827171b06553a7.tar.gz
upstream-e7846156f23b109fd8789d60a4827171b06553a7.tar.bz2
upstream-e7846156f23b109fd8789d60a4827171b06553a7.zip
lantiq: drop linux 4.1 support
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48323
Diffstat (limited to 'target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch')
-rw-r--r--target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
deleted file mode 100644
index 25f3fff213..0000000000
--- a/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
+++ /dev/null
@@ -1,44 +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
-@@ -19,6 +19,7 @@
- #include <linux/errno.h>
- #include <linux/module.h>
- #include <linux/device.h>
-+#include <linux/of.h>
-
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-@@ -182,6 +183,10 @@ static int m25p_probe(struct spi_device
- enum read_mode mode = SPI_NOR_NORMAL;
- char *flash_name = NULL;
- int ret;
-+ const char __maybe_unused *of_mtd_name = NULL;
-+
-+ of_property_read_string(spi->dev.of_node,
-+ "linux,mtd-name", &of_mtd_name);
-
- data = dev_get_platdata(&spi->dev);
-
-@@ -212,6 +217,8 @@ static int m25p_probe(struct spi_device
-
- if (data && data->name)
- nor->mtd.name = data->name;
-+ else if (of_mtd_name)
-+ nor->mtd.name = of_mtd_name;
-
- /* For some (historical?) reason many platforms provide two different
- * names in flash_platform_data: "name" and "type". Quite often name is