From c27b2a528259c4a16d7a91becdcfd534988e8eb1 Mon Sep 17 00:00:00 2001
From: Yonghui Yu <yonghui.yu@amlogic.com>
Date: Tue, 5 Sep 2017 20:07:22 +0800
Subject: [PATCH] mtd: nand: add slc ids and fix timing

PD#150552: mtd: nand: add slc ids and fix timing

Add ids:
    1. Toshiba 4Gib TC58BVG2S0HTA00
    2. Micron 4Gib MT29F4G08ABAEA
    3. Micron 4Gib MT29F4G08ABADA
fix timing for spansion/AMD
    1. S34ML02G1
    2. S34ML01G2

Change-Id: Ie92b0d5b25d1c27701e3ab1c06e5e0fbc7f27630
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
---
 drivers/amlogic/mtd/nand_flash.c | 47 ++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/drivers/amlogic/mtd/nand_flash.c b/drivers/amlogic/mtd/nand_flash.c
index ee36fe05cef4..cfb643e8beaa 100644
--- a/drivers/amlogic/mtd/nand_flash.c
+++ b/drivers/amlogic/mtd/nand_flash.c
@@ -203,7 +203,7 @@ struct aml_nand_flash_dev aml_nand_flash_ids[] = {
 		0x20000,
 		64,
 		1,
-		16,
+		20,
 		15,
 		0,
 		0,
@@ -216,7 +216,7 @@ struct aml_nand_flash_dev aml_nand_flash_ids[] = {
 		0x20000,
 		64,
 		1,
-		16,
+		20,
 		15,
 		0,
 		0,
@@ -229,7 +229,7 @@ struct aml_nand_flash_dev aml_nand_flash_ids[] = {
 		0x20000,
 		64,
 		1,
-		16,
+		20,
 		15,
 		0,
 		0,
@@ -242,7 +242,7 @@ struct aml_nand_flash_dev aml_nand_flash_ids[] = {
 		0x20000,
 		64,
 		1,
-		16,
+		20,
 		15,
 		0,
 		0,
@@ -385,6 +385,18 @@ struct aml_nand_flash_dev aml_nand_flash_ids[] = {
 		0,
 		0,
 		(NAND_TIMING_MODE5 | NAND_ECC_BCH8_MODE)},
+	{"A revision NAND 4Gib TC58BVG2S0HTA00 ",
+		{NAND_MFR_TOSHIBA, 0xdc, 0x90, 0x26, 0xF6},
+		4096,
+		512,
+		0x40000,
+		128,
+		1,
+		20,
+		25,
+		0,
+		0,
+		(NAND_TIMING_MODE5 | NAND_ECC_BCH8_MODE)},
 	{"Slc NAND 1Gib MX30LF1G18AC ",
 		{NAND_MFR_MACRONIX, 0xf1, 0x80, 0x95, 0x02},
 		2048,
@@ -434,7 +446,30 @@ struct aml_nand_flash_dev aml_nand_flash_ids[] = {
 		0,
 		0,
 		(NAND_TIMING_MODE5 | NAND_ECC_BCH8_MODE)},
-
+	{"4Gib MT29F4G08ABAEA",
+		{NAND_MFR_MICRON, 0xdc, 0x90, 0xA6, 0x54},
+		4096,
+		512,
+		0x40000,
+		224,
+		1,
+		16,
+		15,
+		0,
+		0,
+		(NAND_TIMING_MODE5 | NAND_ECC_BCH8_MODE)},
+	{"4Gib MT29F4G08ABADA",
+		{NAND_MFR_MICRON, 0xdc, 0x90, 0x95, 0x56},
+		2048,
+		512,
+		0x20000,
+		64,
+		1,
+		16,
+		15,
+		0,
+		0,
+		(NAND_TIMING_MODE5 | NAND_ECC_BCH8_MODE)},
 	{"A revision NAND 2Gib MT29F2G08-A",
 		{NAND_MFR_MICRON, 0xda, 0x90, 0x95, 0x06},
 		2048,
@@ -448,7 +483,7 @@ struct aml_nand_flash_dev aml_nand_flash_ids[] = {
 		0,
 		(NAND_TIMING_MODE5 | NAND_ECC_BCH8_MODE)},
 
-	{"A revision NAND 1GiB MT29F1G-A",
+	{"A revision NAND 1Gib MT29F1G-A",
 		{NAND_MFR_MICRON, 0xf1, 0x80, 0x95, 0x04},
 		2048,
 		128,