@@ -26,6 +26,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
#include <linux/mtd/spi-nor.h>
+#include <linux/of_address.h>
#define MAX_CMD_SIZE 6
struct m25p {
@@ -196,6 +197,8 @@ static int m25p_probe(struct spi_device *spi)
struct m25p *flash;
struct spi_nor *nor;
enum read_mode mode = SPI_NOR_NORMAL;
+ struct resource res;
+ struct device_node *mnp = spi->master->dev.of_node;
int ret;
flash = devm_kzalloc(&spi->dev, sizeof(*flash), GFP_KERNEL);
@@ -228,6 +231,17 @@ static int m25p_probe(struct spi_device *spi)
data = dev_get_platdata(&spi->dev);
ppdata.of_node = spi->dev.of_node;
+ 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;
+ }
+ }
+
return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
data ? data->parts : NULL,
data ? data->nr_parts : 0);
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 it 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 the physical address of spi master. Signed-off-by: Hou Zhiqiang <B48286@freescale.com> --- V5: Rebase on the latest l2-mtd tree. 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+)