nand: Embed mtd_info in struct nand_chip

[karo-tx-uboot.git] / drivers / mtd / nand / nand.c

diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c
index ebd2acd02bf662bb7e5c614f4897a25a77d867c7..ddd8249d59a481a0e373f592c9b5ff1837731c56 100644 (file)
--- a/drivers/mtd/nand/nand.c
+++ b/drivers/mtd/nand/nand.c
@@ -3,76 +3,114 @@
  * 2N Telekomunikace, a.s. <www.2n.cz>
  * Ladislav Michl <michl@2n.cz>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>
 #include <nand.h>
+#include <errno.h>
 
-#ifndef CFG_NAND_BASE_LIST
-#define CFG_NAND_BASE_LIST { CFG_NAND_BASE }
+#ifndef CONFIG_SYS_NAND_BASE_LIST
+#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[CFG_MAX_NAND_DEVICE];
 
-static struct nand_chip nand_chip[CFG_MAX_NAND_DEVICE];
-static ulong base_address[CFG_MAX_NAND_DEVICE] = CFG_NAND_BASE_LIST;
 
-static const char default_nand_name[] = "nand";
+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];
+static ulong base_address[CONFIG_SYS_MAX_NAND_DEVICE] = CONFIG_SYS_NAND_BASE_LIST;
+#endif
+
+static char dev_name[CONFIG_SYS_MAX_NAND_DEVICE][8];
 
-extern int board_nand_init(struct nand_chip *nand);
+static unsigned long total_nand_size; /* in kiB */
 
-static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand,
-                          ulong base_addr)
+int nand_mtd_to_devnum(struct mtd_info *mtd)
 {
-       mtd->priv = nand;
+       int i;
 
-       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 (!mtd->name)
-                               mtd->name = (char *)default_nand_name;
-               } else
-                       mtd->name = NULL;
-       } else {
-               mtd->name = NULL;
-               mtd->size = 0;
+       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;
+
+       nand_info[devnum] = mtd;
+
+       sprintf(dev_name[devnum], "nand%d", devnum);
+       mtd->name = dev_name[devnum];
+
+#ifdef CONFIG_MTD_DEVICE
+       /*
+        * Add MTD device so that we can reference it later
+        * via the mtdcore infrastructure (e.g. ubi).
+        */
+       add_mtd_device(mtd);
+#endif
+
+       total_nand_size += mtd->size / 1024;
+
+       if (nand_curr_device == -1)
+               nand_curr_device = devnum;
+
+       return 0;
+}
+
+#ifndef CONFIG_SYS_NAND_SELF_INIT
+static void nand_init_chip(int 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;
+
+       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))
+               return;
+
+       if (nand_scan(mtd, maxchips))
+               return;
+
+       nand_register(i, mtd);
+}
+#endif
+
 void nand_init(void)
 {
+#ifdef CONFIG_SYS_NAND_SELF_INIT
+       board_nand_init();
+#else
        int i;
-       unsigned int size = 0;
-       for (i = 0; i < CFG_MAX_NAND_DEVICE; i++) {
-               nand_init_chip(&nand_info[i], &nand_chip[i], base_address[i]);
-               size += nand_info[i].size;
-               if (nand_curr_device == -1)
-                       nand_curr_device = i;
-       }
-       printf("%u MiB\n", size / (1024 * 1024));
 
-#ifdef CFG_NAND_SELECT_DEVICE
+       for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
+               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, nand_curr_device);
+       board_nand_select_device(nand_info[nand_curr_device]->priv,
+                                nand_curr_device);
 #endif
 }