To specify spi flash layouts by mtdparts=... in cmdline, we must
give mtd_info a fixed name,because the cmdlinepart's parser will
match the name of mtd_info given in cmdline.
Now, if use DT, the mtd_info's name will be spi-dev-name. It
consists of spi_master-bus_num, and the spi_master-bus_num maybe
dynamically fetched. So, in this case, replace the component bus_num
with thei physical address of spi master.
Signed-off-by: Hou Zhiqiang b48...@freescale.com
---
v3:
Fix a bug, matching unsigned long long with %llx.
v2:
1. Fix some code style issue.
2. Cast physical address to unsigned long long.
drivers/mtd/devices/m25p80.c | 19 ---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 7eda71d..695890e 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -30,6 +30,7 @@
#include linux/mtd/cfi.h
#include linux/mtd/mtd.h
#include linux/mtd/partitions.h
+#include linux/of_address.h
#include linux/of_platform.h
#include linux/spi/spi.h
@@ -934,9 +935,11 @@ static int m25p_probe(struct spi_device *spi)
struct flash_platform_data *data;
struct m25p *flash;
struct flash_info *info;
- unsignedi;
+ unsignedi, ret;
struct mtd_part_parser_data ppdata;
struct device_node *np = spi-dev.of_node;
+ struct resource res;
+ struct device_node *mnp = spi-master-dev.of_node;
/* Platform data helps sort out which chip type we have, as
* well as how this board partitions it. If we don't have
@@ -1009,8 +1012,18 @@ static int m25p_probe(struct spi_device *spi)
if (data data-name)
flash-mtd.name = data-name;
- else
- flash-mtd.name = dev_name(spi-dev);
+ else {
+ ret = of_address_to_resource(mnp, 0, res);
+ if (ret) {
+ dev_err(spi-dev, failed to get spi master
resource\n);
+ return ret;
+ }
+ flash-mtd.name = kasprintf(GFP_KERNEL, spi%llx.%d,
+ (unsigned long long)res.start,
+ spi-chip_select);
+ if (!flash-mtd.name)
+ return -ENOMEM;
+ }
flash-mtd.type = MTD_NORFLASH;
flash-mtd.writesize = 1;
--
1.8.5
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
