nand: Embed mtd_info in struct nand_chip

[people/ms/u-boot.git] / drivers / mtd / nand / nand.c

diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c
index 46f2654102cc7e62344977ccbd3bcb44025f6d74..ddd8249d59a481a0e373f592c9b5ff1837731c56 100644 (file)
--- a/drivers/mtd/nand/nand.c
+++ b/drivers/mtd/nand/nand.c
@@ -19,7 +19,7 @@ DECLARE_GLOBAL_DATA_PTR;
 int nand_curr_device = -1;
 
 
-struct mtd_info nand_info[CONFIG_SYS_MAX_NAND_DEVICE];
+struct mtd_info *nand_info[CONFIG_SYS_MAX_NAND_DEVICE];
 
 #ifndef CONFIG_SYS_NAND_SELF_INIT
 static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE];
@@ -30,15 +30,25 @@ static char dev_name[CONFIG_SYS_MAX_NAND_DEVICE][8];
 
 static unsigned long total_nand_size; /* in kiB */
 
-/* Register an initialized NAND mtd device with the U-Boot NAND command. */
-int nand_register(int devnum)
+int nand_mtd_to_devnum(struct mtd_info *mtd)
 {
-       struct mtd_info *mtd;
+       int i;
 
+       for (i = 0; i < ARRAY_SIZE(nand_info); i++) {
+               if (mtd && nand_info[i] == mtd)
+                       return i;
+       }
+
+       return -ENODEV;
+}
+
+/* Register an initialized NAND mtd device with the U-Boot NAND command. */
+int nand_register(int devnum, struct mtd_info *mtd)
+{
        if (devnum >= CONFIG_SYS_MAX_NAND_DEVICE)
                return -EINVAL;
 
-       mtd = &nand_info[devnum];
+       nand_info[devnum] = mtd;
 
        sprintf(dev_name[devnum], "nand%d", devnum);
        mtd->name = dev_name[devnum];
@@ -62,8 +72,8 @@ int nand_register(int devnum)
 #ifndef CONFIG_SYS_NAND_SELF_INIT
 static void nand_init_chip(int i)
 {
-       struct mtd_info *mtd = &nand_info[i];
        struct nand_chip *nand = &nand_chip[i];
+       struct mtd_info *mtd = &nand->mtd;
        ulong base_addr = base_address[i];
        int maxchips = CONFIG_SYS_NAND_MAX_CHIPS;
 
@@ -79,7 +89,7 @@ static void nand_init_chip(int i)
        if (nand_scan(mtd, maxchips))
                return;
 
-       nand_register(i);
+       nand_register(i, mtd);
 }
 #endif
 
@@ -100,6 +110,7 @@ void nand_init(void)
        /*
         * Select the chip in the board/cpu specific driver
         */
-       board_nand_select_device(nand_info[nand_curr_device].priv, nand_curr_device);
+       board_nand_select_device(nand_info[nand_curr_device]->priv,
+                                nand_curr_device);
 #endif
 }