Merge branch 'master' of git://git.denx.de/u-boot-blackfin

[u-boot] / drivers / mtd / nand / nand.c

diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c
index 9d8379497431ba19eeb626c1174b7d40384ed177..c0e068ab7d5f9c08973961055242a4bb581798cd 100644 (file)
--- a/drivers/mtd/nand/nand.c
+++ b/drivers/mtd/nand/nand.c
@@ -37,11 +37,13 @@ static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE];
 static ulong base_address[CONFIG_SYS_MAX_NAND_DEVICE] = CONFIG_SYS_NAND_BASE_LIST;
 
 static const char default_nand_name[] = "nand";
+static __attribute__((unused)) char dev_name[CONFIG_SYS_MAX_NAND_DEVICE][8];
 
 static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand,
                           ulong base_addr)
 {
        int maxchips = CONFIG_SYS_NAND_MAX_CHIPS;
+       int __attribute__((unused)) i = 0;
 
        if (maxchips < 1)
                maxchips = 1;
@@ -52,8 +54,20 @@ static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand,
                if (nand_scan(mtd, maxchips) == 0) {
                        if (!mtd->name)
                                mtd->name = (char *)default_nand_name;
+#ifdef CONFIG_NEEDS_MANUAL_RELOC
                        else
                                mtd->name += gd->reloc_off;
+#endif
+
+#ifdef CONFIG_MTD_DEVICE
+                       /*
+                        * Add MTD device so that we can reference it later
+                        * via the mtdcore infrastructure (e.g. ubi).
+                        */
+                       sprintf(dev_name[i], "nand%d", i);
+                       mtd->name = dev_name[i++];
+                       add_mtd_device(mtd);
+#endif
                } else
                        mtd->name = NULL;
        } else {