mtd: nand: omap2: Fix partition creation via cmdline mtdparts

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=2d283ede59869159f4bb84ae689258c5caffce54
Commit:     2d283ede59869159f4bb84ae689258c5caffce54
Parent:     038e8ad6eb720d0b362183f1c30470c1e0797e39
Author:     Roger Quadros <rogerq at ti.com>
AuthorDate: Thu Mar 30 10:37:50 2017 +0300
Committer:  Boris Brezillon <boris.brezillon at free-electrons.com>
CommitDate: Tue Apr 25 14:18:40 2017 +0200

    mtd: nand: omap2: Fix partition creation via cmdline mtdparts
    
    commit c9711ec5250b ("mtd: nand: omap: Clean up device tree support")
    caused the parent device name to be changed from "omap2-nand.0"
    to "<base address>.nand"  (e.g. 30000000.nand on omap3 platforms).
    This caused mtd->name to be changed as well. This breaks partition
    creation via mtdparts passed by u-boot as it uses "omap2-nand.0"
    for the mtd-id.
    
    Fix this by explicitly setting the mtd->name to "omap2-nand.<CS number>"
    if it isn't already set by nand_set_flash_node(). CS number is the
    NAND controller instance ID.
    
    Fixes: c9711ec5250b ("mtd: nand: omap: Clean up device tree support")
    Cc: <stable at vger.kernel.org> # 4.7+
    Reported-by: Leto Enrico <enrico.leto at siemens.com>
    Reported-by: Adam Ford <aford173 at gmail.com>
    Suggested-by: Boris Brezillon <boris.brezillon at free-electrons.com>
    Tested-by: Adam Ford <aford173 at gmail.com>
    Signed-off-by: Roger Quadros <rogerq at ti.com>
    Signed-off-by: Boris Brezillon <boris.brezillon at free-electrons.com>
---
 drivers/mtd/nand/omap2.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 2a52101..084934a 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1856,6 +1856,15 @@ static int omap_nand_probe(struct platform_device *pdev)
 	nand_chip->ecc.priv	= NULL;
 	nand_set_flash_node(nand_chip, dev->of_node);
 
+	if (!mtd->name) {
+		mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
+					   "omap2-nand.%d", info->gpmc_cs);
+		if (!mtd->name) {
+			dev_err(&pdev->dev, "Failed to set MTD name\n");
+			return -ENOMEM;
+		}
+	}
+
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	nand_chip->IO_ADDR_R = devm_ioremap_resource(&pdev->dev, res);
 	if (IS_ERR(nand_chip->IO_ADDR_R))