diff options
author | Matti Laakso <matti.laakso@outlook.com> | 2018-03-18 17:26:24 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-31 16:13:19 +0200 |
commit | 76f267ef6c54cb4cd9c1bee6e21d09495ac2f733 (patch) | |
tree | cf66c913439ec27af5e97fd8bdcf9949fb261918 /target/linux/pistachio/patches-4.9/401-mtd-nor-support-mtd-name-from-device-tree.patch | |
parent | 0394edbba0d365a367cc207b62914f3adce2ee1d (diff) | |
download | upstream-76f267ef6c54cb4cd9c1bee6e21d09495ac2f733.tar.gz upstream-76f267ef6c54cb4cd9c1bee6e21d09495ac2f733.tar.bz2 upstream-76f267ef6c54cb4cd9c1bee6e21d09495ac2f733.zip |
pistachio: remove kernel 4.9 support
Signed-off-by: Matti Laakso <matti.laakso@outlook.com>
Diffstat (limited to 'target/linux/pistachio/patches-4.9/401-mtd-nor-support-mtd-name-from-device-tree.patch')
-rw-r--r-- | target/linux/pistachio/patches-4.9/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.9/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-4.9/401-mtd-nor-support-mtd-name-from-device-tree.patch deleted file mode 100644 index 20ca71ea86..0000000000 --- a/target/linux/pistachio/patches-4.9/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 -@@ -1541,6 +1541,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; - -@@ -1606,7 +1607,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; |