2013-09-17 21:46:10 +00:00
|
|
|
From 65d48cd98505800c6765ff94fc007797e00d466f Mon Sep 17 00:00:00 2001
|
2013-03-14 18:42:29 +00:00
|
|
|
From: John Crispin <blogic@openwrt.org>
|
|
|
|
|
Date: Tue, 29 Jan 2013 21:11:55 +0100
|
2013-09-17 21:46:10 +00:00
|
|
|
Subject: [PATCH 12/34] MTD: m25p80: allow loading mtd name from OF
|
2013-03-14 18:42:29 +00:00
|
|
|
|
|
|
|
|
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 <thomas.langer@lantiq.com>
|
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/mtd/devices/m25p80.c | 5 +++++
|
|
|
|
|
1 file changed, 5 insertions(+)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/mtd/devices/m25p80.c
|
|
|
|
|
+++ b/drivers/mtd/devices/m25p80.c
|
2014-01-11 16:06:37 +00:00
|
|
|
@@ -926,10 +926,13 @@ static int m25p_probe(struct spi_device
|
2013-03-14 18:42:29 +00:00
|
|
|
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
|
2014-01-11 16:06:37 +00:00
|
|
|
@@ -1005,6 +1008,8 @@ static int m25p_probe(struct spi_device
|
2013-03-14 18:42:29 +00:00
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
|
