From 65d48cd98505800c6765ff94fc007797e00d466f Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 29 Jan 2013 21:11:55 +0100 Subject: [PATCH 12/34] 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 Signed-off-by: John Crispin --- drivers/mtd/devices/m25p80.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 2f3d2a5..1828704 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -909,10 +909,13 @@ static int m25p_probe(struct spi_device *spi) unsigned i; struct mtd_part_parser_data ppdata; struct device_node __maybe_unused *np = spi->dev.of_node; + const char __maybe_unused *of_mtd_name = NULL; #ifdef CONFIG_MTD_OF_PARTS if (!of_device_is_available(np)) return -ENODEV; + of_property_read_string(spi->dev.of_node, + "linux,mtd-name", &of_mtd_name); #endif /* Platform data helps sort out which chip type we have, as @@ -988,6 +991,8 @@ static int m25p_probe(struct spi_device *spi) if (data && data->name) flash->mtd.name = data->name; + else if (of_mtd_name) + flash->mtd.name = of_mtd_name; else flash->mtd.name = dev_name(&spi->dev); -- 1.7.10.4