[PATCH V3 3/3] mtd: add the new detection method for the unparsable nand chips

2013-01-27 Thread Huang Shijie
Add the new detection method find_nand_type_by_fullid() for the
unparsable nand chips. The new detection method is called firstly
before all the other detection methods.

Signed-off-by: Huang Shijie 
---
 drivers/mtd/nand/nand_base.c |   33 -
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 0e80ec4..7f0431d 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -3152,6 +3152,29 @@ static void nand_decode_bbm_options(struct mtd_info *mtd,
chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;
 }
 
+static struct nand_flash_dev *find_nand_type_by_fullid(struct mtd_info *mtd,
+   struct nand_chip *chip, u8 *id_data, int *busw)
+{
+   struct nand_flash_dev *type = nand_flash_full_ids;
+
+   for (; type->name != NULL; type++) {
+   if (!strncmp(type->id, id_data, type->id_len)) {
+   mtd->writesize = type->pagesize;
+   mtd->erasesize = type->erasesize;
+   mtd->oobsize = type->oobsize;
+
+   chip->cellinfo = id_data[2];
+   chip->chipsize = (uint64_t)type->chipsize << 20;
+   chip->options |= type->options;
+
+   *busw = type->options & NAND_BUSWIDTH_16;
+
+   break;
+   }
+   }
+   return type;
+}
+
 /*
  * Get the flash and manufacturer id and lookup if the type is supported.
  */
@@ -3200,8 +3223,16 @@ static struct nand_flash_dev *nand_get_flash_type(struct 
mtd_info *mtd,
return ERR_PTR(-ENODEV);
}
 
-   if (!type)
+   if (!type) {
+   /*
+* Some nand chips's information can not be paresed out
+* from the id data. So, try your luck in the full-id table.
+*/
+   type = find_nand_type_by_fullid(mtd, chip, id_data, );
+   if (type->name != NULL)
+   goto ident_done;
type = nand_flash_ids;
+   }
 
for (; type->name != NULL; type++)
if (*dev_id == type->id[1])
-- 
1.7.0.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH V3 3/3] mtd: add the new detection method for the unparsable nand chips

2013-01-27 Thread Huang Shijie
Add the new detection method find_nand_type_by_fullid() for the
unparsable nand chips. The new detection method is called firstly
before all the other detection methods.

Signed-off-by: Huang Shijie b32...@freescale.com
---
 drivers/mtd/nand/nand_base.c |   33 -
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 0e80ec4..7f0431d 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -3152,6 +3152,29 @@ static void nand_decode_bbm_options(struct mtd_info *mtd,
chip-bbt_options |= NAND_BBT_SCAN2NDPAGE;
 }
 
+static struct nand_flash_dev *find_nand_type_by_fullid(struct mtd_info *mtd,
+   struct nand_chip *chip, u8 *id_data, int *busw)
+{
+   struct nand_flash_dev *type = nand_flash_full_ids;
+
+   for (; type-name != NULL; type++) {
+   if (!strncmp(type-id, id_data, type-id_len)) {
+   mtd-writesize = type-pagesize;
+   mtd-erasesize = type-erasesize;
+   mtd-oobsize = type-oobsize;
+
+   chip-cellinfo = id_data[2];
+   chip-chipsize = (uint64_t)type-chipsize  20;
+   chip-options |= type-options;
+
+   *busw = type-options  NAND_BUSWIDTH_16;
+
+   break;
+   }
+   }
+   return type;
+}
+
 /*
  * Get the flash and manufacturer id and lookup if the type is supported.
  */
@@ -3200,8 +3223,16 @@ static struct nand_flash_dev *nand_get_flash_type(struct 
mtd_info *mtd,
return ERR_PTR(-ENODEV);
}
 
-   if (!type)
+   if (!type) {
+   /*
+* Some nand chips's information can not be paresed out
+* from the id data. So, try your luck in the full-id table.
+*/
+   type = find_nand_type_by_fullid(mtd, chip, id_data, busw);
+   if (type-name != NULL)
+   goto ident_done;
type = nand_flash_ids;
+   }
 
for (; type-name != NULL; type++)
if (*dev_id == type-id[1])
-- 
1.7.0.4


--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/