From abfb8e08282d3638336516886228a5522033788a Mon Sep 17 00:00:00 2001
From: Saeed Bishara <saeed@marvell.com>
Date: Sun, 4 May 2008 19:25:52 -1100
Subject: [PATCH] --- yaml --- r: 100768 b: refs/heads/master c:
 f4db56ffd43a810424866fac6de9a32486415316 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/mtd/nand/orion_nand.c           | 3 +++
 trunk/include/asm-arm/plat-orion/orion_nand.h | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0cb4c4dd6dbd..c2b330ff445a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 395aed6de6d063bc234a179d65d3b6d720ce589a
+refs/heads/master: f4db56ffd43a810424866fac6de9a32486415316
diff --git a/trunk/drivers/mtd/nand/orion_nand.c b/trunk/drivers/mtd/nand/orion_nand.c
index 59e05a1c50cf..ee2ac3948cd8 100644
--- a/trunk/drivers/mtd/nand/orion_nand.c
+++ b/trunk/drivers/mtd/nand/orion_nand.c
@@ -85,6 +85,9 @@ static int __init orion_nand_probe(struct platform_device *pdev)
 	nc->cmd_ctrl = orion_nand_cmd_ctrl;
 	nc->ecc.mode = NAND_ECC_SOFT;
 
+	if (board->chip_delay)
+		nc->chip_delay = board->chip_delay;
+
 	if (board->width == 16)
 		nc->options |= NAND_BUSWIDTH_16;
 
diff --git a/trunk/include/asm-arm/plat-orion/orion_nand.h b/trunk/include/asm-arm/plat-orion/orion_nand.h
index ffd3852a0dd7..ad4ce94c1998 100644
--- a/trunk/include/asm-arm/plat-orion/orion_nand.h
+++ b/trunk/include/asm-arm/plat-orion/orion_nand.h
@@ -18,6 +18,7 @@ struct orion_nand_data {
 	u8 ale;		/* address line number connected to ALE */
 	u8 cle;		/* address line number connected to CLE */
 	u8 width;	/* buswidth */
+	u8 chip_delay;
 };