NAND: show manufacturer and device ID for unknown chips

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

diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c
index 300517e869d09d94b34579a206802d70332f04c6..6a0cab3059ba2b0976afa3e6ca85b50c3ed9bc87 100644 (file)
--- a/drivers/mtd/cfi_mtd.c
+++ b/drivers/mtd/cfi_mtd.c
@@ -31,10 +31,17 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/concat.h>
 
+/* use CONFIG_SYS_MAX_FLASH_BANKS_DETECT if defined */
+#ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECT
+# define CFI_MAX_FLASH_BANKS   CONFIG_SYS_MAX_FLASH_BANKS_DETECT
+#else
+# define CFI_MAX_FLASH_BANKS   CONFIG_SYS_MAX_FLASH_BANKS
+#endif
+
 extern flash_info_t flash_info[];
 
-static struct mtd_info cfi_mtd_info[CONFIG_SYS_MAX_FLASH_BANKS];
-static char cfi_mtd_names[CONFIG_SYS_MAX_FLASH_BANKS][16];
+static struct mtd_info cfi_mtd_info[CFI_MAX_FLASH_BANKS];
+static char cfi_mtd_names[CFI_MAX_FLASH_BANKS][16];
 #ifdef CONFIG_MTD_CONCAT
 static char c_mtd_name[16];
 #endif
@@ -123,7 +130,7 @@ static void cfi_mtd_sync(struct mtd_info *mtd)
         */
 }
 
-static int cfi_mtd_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
+static int cfi_mtd_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 {
        flash_info_t *fi = mtd->priv;
 
@@ -135,7 +142,7 @@ static int cfi_mtd_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
        return 0;
 }
 
-static int cfi_mtd_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
+static int cfi_mtd_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 {
        flash_info_t *fi = mtd->priv;
 
@@ -154,8 +161,8 @@ static int cfi_mtd_set_erasesize(struct mtd_info *mtd, flash_info_t *fi)
        int sect;
        int regions = 0;
        int numblocks = 0;
-       ulong offset = 0;
-       ulong base_addr = fi->start[0];
+       ulong offset;
+       ulong base_addr;
 
        /*
         * First detect the number of eraseregions so that we can allocate
@@ -167,29 +174,35 @@ static int cfi_mtd_set_erasesize(struct mtd_info *mtd, flash_info_t *fi)
                sect_size_old = flash_sector_size(fi, sect);
        }
 
+       switch (regions) {
+       case 0:
+               return 1;
+       case 1: /* flash has uniform erase size */
+               mtd->numeraseregions = 0;
+               mtd->erasesize = sect_size_old;
+               return 0;
+       }
+
+       mtd->numeraseregions = regions;
        mtd->eraseregions = malloc(sizeof(struct mtd_erase_region_info) * regions);
 
        /*
         * Now detect the largest sector and fill the eraseregions
         */
-       sect_size_old = 0;
        regions = 0;
+       base_addr = offset = fi->start[0];
+       sect_size_old = flash_sector_size(fi, 0);
        for (sect = 0; sect < fi->sector_count; sect++) {
-               if ((sect_size_old != flash_sector_size(fi, sect)) &&
-                   (sect_size_old != 0)) {
+               if (sect_size_old != flash_sector_size(fi, sect)) {
                        mtd->eraseregions[regions].offset = offset - base_addr;
                        mtd->eraseregions[regions].erasesize = sect_size_old;
                        mtd->eraseregions[regions].numblocks = numblocks;
-
                        /* Now start counting the next eraseregions */
                        numblocks = 0;
                        regions++;
-               } else {
-                       numblocks++;
-               }
-
-               if (sect_size_old != flash_sector_size(fi, sect))
                        offset = fi->start[sect];
+               }
+               numblocks++;
 
                /*
                 * Select the largest sector size as erasesize (e.g. for UBI)
@@ -205,12 +218,7 @@ static int cfi_mtd_set_erasesize(struct mtd_info *mtd, flash_info_t *fi)
         */
        mtd->eraseregions[regions].offset = offset - base_addr;
        mtd->eraseregions[regions].erasesize = sect_size_old;
-       mtd->eraseregions[regions].numblocks = numblocks + 1;
-
-       if (regions)
-               mtd->numeraseregions = regions + 1;
-       else
-               mtd->numeraseregions = 0;
+       mtd->eraseregions[regions].numblocks = numblocks;
 
        mtd->erasesize = sect_size;