[v3,02/37] mtd: nand: denali: allow to override mtd->name from label DT property

Message ID 1490856383-31560-3-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit 8aabdf376f2baafbaaceeee1f3f7f7dca70f8e0b
Headers show
  • mtd: nand: denali: 2nd round of Denali NAND IP patch bomb
Related show

Commit Message

Masahiro Yamada March 30, 2017, 6:45 a.m.
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>

Changes in v3:
  - Replaced "mtd: nand: denali: do not set mtd->name" in v2

Changes in v2: None

 drivers/mtd/nand/denali.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


Linux MTD discussion mailing list


diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index 4ca75d3..4e6d03d 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;