sugar/linux
1
0
Fork 0
Code Activity

Merge tag 'spi-nor/for-4.17' of git://git.infradead.org/linux-mtd into mtd/next

Browse Source 
* Make fsl-quaspi assign different names to MTD devices connected
  to the same QSPI controller
* Remove an unneeded driver.bus assigned in the fsl-qspi driver
This commit is contained in:
Boris Brezillon
2018-04-04 22:11:24 +02:00
parent b756816dad e8de85d5a1
commit 7c0ed565d2
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/mtd/spi-nor/fsl-quadspi.c
View File

@@ -1051,6 +1051,24 @@ static int fsl_qspi_probe(struct platform_device *pdev)
spi_nor_set_flash_node(nor, np);
nor->priv = q;
if (q->nor_num > 1 && !mtd->name) {
int spiflash_idx;
ret = of_property_read_u32(np, "reg", &spiflash_idx);
if (!ret) {
mtd->name = devm_kasprintf(dev, GFP_KERNEL,
"%s-%d",
dev_name(dev),
spiflash_idx);
if (!mtd->name) {
ret = -ENOMEM;
goto mutex_failed;
}
} else {
dev_warn(dev, "reg property is missing\n");
}
}
/* fill the hooks */
nor->read_reg = fsl_qspi_read_reg;
nor->write_reg = fsl_qspi_write_reg;
@@ -1174,7 +1192,6 @@ static int fsl_qspi_resume(struct platform_device *pdev)
static struct platform_driver fsl_qspi_driver = {
.driver = {
.name = "fsl-quadspi",
.bus = &platform_bus_type,
.of_match_table = fsl_qspi_dt_ids,
},
.probe = fsl_qspi_probe,