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 cf9261786d8e497472684d379b01cb00c7afb12c..c0e068ab7d5f9c08973961055242a4bb581798cd 100644 (file)
--- a/drivers/mtd/nand/nand.c
+++ b/drivers/mtd/nand/nand.c
@@ -28,6 +28,8 @@
 #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE }
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int nand_curr_device = -1;
 nand_info_t nand_info[CONFIG_SYS_MAX_NAND_DEVICE];
 
@@ -35,17 +37,37 @@ 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;
        mtd->priv = nand;
 
        nand->IO_ADDR_R = nand->IO_ADDR_W = (void  __iomem *)base_addr;
        if (board_nand_init(nand) == 0) {
-               if (nand_scan(mtd, 1) == 0) {
+               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 {