mtd: nand: Wait for PAGEPROG to finish in drivers setting NAND_ECC_CUSTOM_PAGE_ACCESS

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

diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c
index ddd8249d59a481a0e373f592c9b5ff1837731c56..6aa909fdd9751b3b5a853d7b70c8d5e977fe28ea 100644 (file)
--- a/drivers/mtd/nand/nand.c
+++ b/drivers/mtd/nand/nand.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <nand.h>
 #include <errno.h>
+#include <linux/mtd/concat.h>
 
 #ifndef CONFIG_SYS_NAND_BASE_LIST
 #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE }
@@ -18,8 +19,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int nand_curr_device = -1;
 
-
-struct mtd_info *nand_info[CONFIG_SYS_MAX_NAND_DEVICE];
+static 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,12 +30,21 @@ static char dev_name[CONFIG_SYS_MAX_NAND_DEVICE][8];
 
 static unsigned long total_nand_size; /* in kiB */
 
+struct mtd_info *get_nand_dev_by_index(int dev)
+{
+       if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[dev] ||
+           !nand_info[dev]->name)
+               return NULL;
+
+       return nand_info[dev];
+}
+
 int nand_mtd_to_devnum(struct mtd_info *mtd)
 {
        int i;
 
-       for (i = 0; i < ARRAY_SIZE(nand_info); i++) {
-               if (mtd && nand_info[i] == mtd)
+       for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) {
+               if (mtd && get_nand_dev_by_index(i) == mtd)
                        return i;
        }
 
@@ -73,14 +82,13 @@ int nand_register(int devnum, struct mtd_info *mtd)
 static void nand_init_chip(int i)
 {
        struct nand_chip *nand = &nand_chip[i];
-       struct mtd_info *mtd = &nand->mtd;
+       struct mtd_info *mtd = nand_to_mtd(nand);
        ulong base_addr = base_address[i];
        int maxchips = CONFIG_SYS_NAND_MAX_CHIPS;
 
        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))
@@ -93,8 +101,62 @@ static void nand_init_chip(int i)
 }
 #endif
 
+#ifdef CONFIG_MTD_CONCAT
+static void create_mtd_concat(void)
+{
+       struct mtd_info *nand_info_list[CONFIG_SYS_MAX_NAND_DEVICE];
+       int nand_devices_found = 0;
+       int i;
+
+       for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) {
+               struct mtd_info *mtd = get_nand_dev_by_index(i);
+               if (mtd != NULL) {
+                       nand_info_list[nand_devices_found] = mtd;
+                       nand_devices_found++;
+               }
+       }
+       if (nand_devices_found > 1) {
+               struct mtd_info *mtd;
+               char c_mtd_name[16];
+
+               /*
+                * We detected multiple devices. Concatenate them together.
+                */
+               sprintf(c_mtd_name, "nand%d", nand_devices_found);
+               mtd = mtd_concat_create(nand_info_list, nand_devices_found,
+                                       c_mtd_name);
+
+               if (mtd == NULL)
+                       return;
+
+               nand_register(nand_devices_found, mtd);
+       }
+
+       return;
+}
+#else
+static void create_mtd_concat(void)
+{
+}
+#endif
+
+unsigned long nand_size(void)
+{
+       return total_nand_size;
+}
+
 void nand_init(void)
 {
+       static int initialized;
+
+       /*
+        * Avoid initializing NAND Flash multiple times,
+        * otherwise it will calculate a wrong total size.
+        */
+       if (initialized)
+               return;
+       initialized = 1;
+
 #ifdef CONFIG_SYS_NAND_SELF_INIT
        board_nand_init();
 #else
@@ -104,13 +166,13 @@ void nand_init(void)
                nand_init_chip(i);
 #endif
 
-       printf("%lu MiB\n", total_nand_size / 1024);
-
 #ifdef CONFIG_SYS_NAND_SELECT_DEVICE
        /*
         * Select the chip in the board/cpu specific driver
         */
-       board_nand_select_device(nand_info[nand_curr_device]->priv,
+       board_nand_select_device(mtd_to_nand(get_nand_dev_by_index(nand_curr_device)),
                                 nand_curr_device);
 #endif
+
+       create_mtd_concat();
 }