| 123456789101112131415161718192021222324252627282930313233343536373839 |
- From 0a27a5e5917d8d5e179763788c204d12895c278b Mon Sep 17 00:00:00 2001
- From: John Crispin <[email protected]>
- Date: Tue, 29 Jan 2013 21:11:55 +0100
- Subject: [PATCH 01/22] 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 <[email protected]>
- Signed-off-by: John Crispin <[email protected]>
- ---
- drivers/mtd/devices/m25p80.c | 5 +++++
- 1 file changed, 5 insertions(+)
- --- a/drivers/mtd/devices/m25p80.c
- +++ b/drivers/mtd/devices/m25p80.c
- @@ -922,10 +922,13 @@ static int m25p_probe(struct spi_device
- 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
- @@ -1001,6 +1004,8 @@ static int m25p_probe(struct spi_device
-
- 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);
-
|
