40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
|
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(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
|
||
|
|
index d0fc165..fcee697 100644
|
||
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||
|
|
@@ -1306,6 +1306,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
|
||
|
|
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;
|
||
|
|
|
||
|
|
@@ -1361,7 +1362,12 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
|
||
|
|
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;
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|