Patchwork mtd: nand: Samsung MLC - new OOB sizes

login
register
mail settings
Submitter Brian Norris
Date Aug. 20, 2010, 5:50 p.m.
Message ID <1282326643-9598-1-git-send-email-norris@broadcom.com>
Download mbox | patch
Permalink /patch/62296/
State Accepted
Commit 34c5bf6cc78e56537e0d508f5979f27ea8a64e31
Headers show

Comments

Brian Norris - Aug. 20, 2010, 5:50 p.m.
There are some additions to the detection scheme used by Samsung
MLC NAND. These simple changes to support the 400- and 436-byte OOB
are found in the following data sheet:

Samsung K9GBG08U0M (p.40)

Signed-off-by: Brian Norris <norris@broadcom.com>
---
 drivers/mtd/nand/nand_base.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)
Artem Bityutskiy - Aug. 30, 2010, 10:44 a.m.
On Fri, 2010-08-20 at 10:50 -0700, Brian Norris wrote:
> There are some additions to the detection scheme used by Samsung
> MLC NAND. These simple changes to support the 400- and 436-byte OOB
> are found in the following data sheet:
> 
> Samsung K9GBG08U0M (p.40)
> 
> Signed-off-by: Brian Norris <norris@broadcom.com>
> ---
>  drivers/mtd/nand/nand_base.c |   17 +++++++++++++++--
>  1 files changed, 15 insertions(+), 2 deletions(-)

Thanks, pushed to l2-mtd-2.6.git / dunno

Patch

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index a3c7473..80ff671 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2859,7 +2859,7 @@  static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
 		/*
 		 * Field definitions are in the following datasheets:
 		 * Old style (4,5 byte ID): Samsung K9GAG08U0M (p.32)
-		 * New style   (6 byte ID): Samsung K9GAG08U0D (p.40)
+		 * New style   (6 byte ID): Samsung K9GBG08U0M (p.40)
 		 *
 		 * Check for wraparound + Samsung ID + nonzero 6th byte
 		 * to decide what to do.
@@ -2871,7 +2871,20 @@  static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
 			mtd->writesize = 2048 << (extid & 0x03);
 			extid >>= 2;
 			/* Calc oobsize */
-			mtd->oobsize = (extid & 0x03) == 0x01 ? 128 : 218;
+			switch (extid & 0x03) {
+			case 1:
+				mtd->oobsize = 128;
+				break;
+			case 2:
+				mtd->oobsize = 218;
+				break;
+			case 3:
+				mtd->oobsize = 400;
+				break;
+			default:
+				mtd->oobsize = 436;
+				break;
+			}
 			extid >>= 2;
 			/* Calc blocksize */
 			mtd->erasesize = (128 * 1024) <<