diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-03-30 08:45:48 +0200 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-04-25 14:18:31 +0200 |
| commit | 8aabdf376f2baafbaaceeee1f3f7f7dca70f8e0b (patch) | |
| tree | ad5ca31bf76eb0b6ea784c843148b9a0e34c4d0a /drivers/mtd | |
| parent | mtd: nand: relax ecc.read_page() return value for uncorrectable ECC (diff) | |
| download | linux-8aabdf376f2baafbaaceeee1f3f7f7dca70f8e0b.tar.xz linux-8aabdf376f2baafbaaceeee1f3f7f7dca70f8e0b.zip | |
mtd: nand: denali: allow to override mtd->name from label DT property
Commit 28309572aac4 ("mtd: name the mtd device with an optional
label property") allow us to identify a chip in a user-friendly way.
If nand_set_flash_node() picks up the "label" from DT, let's respect
it. Otherwise, let it fallback to the current name "denali-nand".
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Suggested-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/denali.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 4ca75d3926ef..4e6d03d7a031 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -1462,8 +1462,10 @@ int denali_init(struct denali_nand_info *denali) /* now that our ISR is registered, we can enable interrupts */ denali_set_intr_modes(denali, true); - mtd->name = "denali-nand"; nand_set_flash_node(chip, denali->dev->of_node); + /* Fallback to the default name if DT did not give "label" property */ + if (!mtd->name) + mtd->name = "denali-nand"; /* register the driver with the NAND core subsystem */ chip->select_chip = denali_select_chip; |