mtd: name the mtd device with an optional label property

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=28309572aac4c632666053dc8bf9906a3594b8d2
Commit:     28309572aac4c632666053dc8bf9906a3594b8d2
Parent:     398d8739bb900562f40e22aebdfc9970803d04b7
Author:     Cédric Le Goater <clg at kaod.org>
AuthorDate: Thu Feb 9 10:21:07 2017 +0100
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Fri Feb 10 10:16:34 2017 -0800

    mtd: name the mtd device with an optional label property
    
    This can be used to easily identify a specific chip on a system with
    multiple chips.
    
    Suggested-by: Boris Brezillon <boris.brezillon at free-electrons.com>
    Signed-off-by: Cédric Le Goater <clg at kaod.org>
    Reviewed-by: Marek Vasut <marek.vasut at gmail.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 include/linux/mtd/mtd.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 5bb42c6..eebdc63 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -24,6 +24,7 @@
 #include <linux/uio.h>
 #include <linux/notifier.h>
 #include <linux/device.h>
+#include <linux/of.h>
 
 #include <mtd/mtd-abi.h>
 
@@ -386,6 +387,8 @@ static inline void mtd_set_of_node(struct mtd_info *mtd,
 				   struct device_node *np)
 {
 	mtd->dev.of_node = np;
+	if (!mtd->name)
+		of_property_read_string(np, "label", &mtd->name);
 }
 
 static inline struct device_node *mtd_get_of_node(struct mtd_info *mtd)