mtd: maps: physmap: Retain mtd-name property from dts

In physmap_flash_of_init() the maps[].name can be populated based on the
optional 'linux,mtd-name' property in the dts. Make sure this is
retained when filling in the rest of the map[] data.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200824025744.25992-1-chris.packham@alliedtelesis.co.nz

diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c
index 8f7f966fa9a7ee8aa22690b892613b5af7fdd486..6372197ad8656122a23d3c6a2d6fc97932ace43f 100644 (file)
--- a/drivers/mtd/maps/physmap-core.c
+++ b/drivers/mtd/maps/physmap-core.c
@@ -515,7 +515,8 @@ static int physmap_flash_probe(struct platform_device *dev)
                dev_notice(&dev->dev, "physmap platform flash device: %pR\n",
                           res);
 
-               info->maps[i].name = dev_name(&dev->dev);
+               if (!info->maps[i].name)
+                       info->maps[i].name = dev_name(&dev->dev);
 
                if (!info->maps[i].phys)
                        info->maps[i].phys = res->start;