diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-11-25 19:35:16 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2019-07-04 08:29:13 +0200 |
| commit | eee1b34ce688efcb824ea9ce08edfce7ec507599 (patch) | |
| tree | c26d7c8491852b20a4cb179ad42752624860c896 /target/linux/lantiq/patches-4.19/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | |
| parent | bf21b6e44d0dd90846582249cc26230f249e6a63 (diff) | |
| download | upstream-eee1b34ce688efcb824ea9ce08edfce7ec507599.tar.gz upstream-eee1b34ce688efcb824ea9ce08edfce7ec507599.tar.bz2 upstream-eee1b34ce688efcb824ea9ce08edfce7ec507599.zip | |
lantiq: copy target to kernel 4.19
This just copies the files from the kernel 4.14 specific folders into
the kernel 4.19 specific folder, no changes are done to the files in
this commit.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/lantiq/patches-4.19/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch')
| -rw-r--r-- | target/linux/lantiq/patches-4.19/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-4.19/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-4.19/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch new file mode 100644 index 0000000000..415c8579bd --- /dev/null +++ b/target/linux/lantiq/patches-4.19/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch @@ -0,0 +1,44 @@ +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> +@@ -245,6 +246,10 @@ static int m25p_probe(struct spi_device + }; + char *flash_name; + 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); + +@@ -283,6 +288,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 |