* [PATCH V4] mtd: m25p80: Modify the name of mtd_info
@ 2014-04-21 11:06 Hou Zhiqiang
2014-04-21 15:30 ` Huang Shijie
0 siblings, 1 reply; 2+ messages in thread
From: Hou Zhiqiang @ 2014-04-21 11:06 UTC (permalink / raw)
To: linux-mtd, linuxppc-dev
Cc: scottwood, Hou Zhiqiang, mingkai.hu, computersforpeace, dwmw2
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 <B48286@freescale.com>
---
V4:
add check no-NULL for pointer of master's device node, and if it failed
to get physcial address of the master, then name the mtd_info by the
name of spi->dev.
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 | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 7eda71d..998b283 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -934,9 +934,11 @@ static int m25p_probe(struct spi_device *spi)
struct flash_platform_data *data;
struct m25p *flash;
struct flash_info *info;
- unsigned i;
+ unsigned i, 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,7 +1011,17 @@ static int m25p_probe(struct spi_device *spi)
if (data && data->name)
flash->mtd.name = data->name;
- else
+ else if (mnp) {
+ ret = of_address_to_resource(mnp, 0, &res);
+ if (!ret) {
+ flash->mtd.name = kasprintf(GFP_KERNEL, "spi%llx.%d",
+ (unsigned long long)res.start,
+ spi->chip_select);
+ if (!flash->mtd.name)
+ return -ENOMEM;
+ } else
+ dev_dbg(&spi->dev, "failed to get spi master resource\n");
+ } else
flash->mtd.name = dev_name(&spi->dev);
flash->mtd.type = MTD_NORFLASH;
--
1.8.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH V4] mtd: m25p80: Modify the name of mtd_info
2014-04-21 11:06 [PATCH V4] mtd: m25p80: Modify the name of mtd_info Hou Zhiqiang
@ 2014-04-21 15:30 ` Huang Shijie
0 siblings, 0 replies; 2+ messages in thread
From: Huang Shijie @ 2014-04-21 15:30 UTC (permalink / raw)
To: Hou Zhiqiang
Cc: linuxppc-dev, linux-mtd, scottwood, mingkai.hu, computersforpeace, dwmw2
On Mon, Apr 21, 2014 at 07:06:21PM +0800, Hou Zhiqiang wrote:
> 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 <B48286@freescale.com>
> ---
> V4:
> add check no-NULL for pointer of master's device node, and if it failed
> to get physcial address of the master, then name the mtd_info by the
> name of spi->dev.
> 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 | 16 ++++++++++++++--
please rebase this patch on the latest l2-mtd tree.
thanks
Huang Shijie
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-04-21 15:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-21 11:06 [PATCH V4] mtd: m25p80: Modify the name of mtd_info Hou Zhiqiang
2014-04-21 15:30 ` Huang Shijie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).