diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-08-20 14:26:27 +0200 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-09-02 16:29:22 +0200 |
commit | e68c017e9315fb246e820565ec3e18cf0bd8649e (patch) | |
tree | fe8dbf6e861793ad1a67a5bbafa0f9fe932deeb3 /target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch | |
parent | 64824db6d8fcd4d90bcd205fa4c798c2972514f5 (diff) | |
download | upstream-e68c017e9315fb246e820565ec3e18cf0bd8649e.tar.gz upstream-e68c017e9315fb246e820565ec3e18cf0bd8649e.tar.bz2 upstream-e68c017e9315fb246e820565ec3e18cf0bd8649e.zip |
pistachio: drop support for kernel 4.14
The target seems to be working on 5.4, so drop 4.14 support in
preparation for removing it from master entirely.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch')
-rw-r--r-- | target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch deleted file mode 100644 index 065a0b77bc..0000000000 --- a/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f32bc2aa01edcba2f2ed5db151cf183eac9ef919 Mon Sep 17 00:00:00 2001 -From: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> -Date: Sat, 25 Feb 2017 16:42:50 +0000 -Subject: mtd: nor: support mtd name from device tree - -Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> ---- - drivers/mtd/spi-nor/spi-nor.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -2671,6 +2671,7 @@ int spi_nor_scan(struct spi_nor *nor, co - struct device *dev = nor->dev; - struct mtd_info *mtd = &nor->mtd; - struct device_node *np = spi_nor_get_flash_node(nor); -+ const char __maybe_unused *of_mtd_name = NULL; - int ret; - int i; - -@@ -2746,7 +2747,12 @@ int spi_nor_scan(struct spi_nor *nor, co - spi_nor_wait_till_ready(nor); - } - -- if (!mtd->name) -+#ifdef CONFIG_MTD_OF_PARTS -+ of_property_read_string(np, "linux,mtd-name", &of_mtd_name); -+#endif -+ if (of_mtd_name) -+ mtd->name = of_mtd_name; -+ else if (!mtd->name) - mtd->name = dev_name(dev); - mtd->priv = nor; - mtd->type = MTD_NORFLASH; |