lkml.org 
[lkml]   [2017]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.11 184/197] mtd: nand: omap2: Fix partition creation via cmdline mtdparts
    Date
    4.11-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Roger Quadros <rogerq@ti.com>

    commit 2d283ede59869159f4bb84ae689258c5caffce54 upstream.

    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")
    Reported-by: Leto Enrico <enrico.leto@siemens.com>
    Reported-by: Adam Ford <aford173@gmail.com>
    Suggested-by: Boris Brezillon <boris.brezillon@free-electrons.com>
    Tested-by: Adam Ford <aford173@gmail.com>
    Signed-off-by: Roger Quadros <rogerq@ti.com>
    Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mtd/nand/omap2.c | 9 +++++++++
    1 file changed, 9 insertions(+)

    --- a/drivers/mtd/nand/omap2.c
    +++ b/drivers/mtd/nand/omap2.c
    @@ -1856,6 +1856,15 @@ static int omap_nand_probe(struct platfo
    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))

    \
     
     \ /
      Last update: 2017-05-24 00:01    [W:3.884 / U:1.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site