From: Naveen Mamindlapalli <naveenm@xhd-epdswlin32re1.(none)>
Date: Fri, 24 Jun 2011 11:11:21 +0000 (+0530)
Subject: Xilinx: ARM: Added support for Dual Die NAND
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2005665d694857a12ee1daa1705319576a49598;p=thirdparty%2Fu-boot.git

Xilinx: ARM: Added support for Dual Die NAND

Added support for detecting Dual Die NAND with OnDie ECC support.

Signed-Off-by: Naveen Mamindlapalli<naveenm@xilinx.com>
---

diff --git a/board/xilinx/dfe/xilinx_nandpss.c b/board/xilinx/dfe/xilinx_nandpss.c
index 5d349abb38b..f6629062511 100644
--- a/board/xilinx/dfe/xilinx_nandpss.c
+++ b/board/xilinx/dfe/xilinx_nandpss.c
@@ -1134,7 +1134,14 @@ int board_nand_init(struct nand_chip *nand_chip)
 	maf_id = nand_chip->read_byte(mtd);
 	dev_id = nand_chip->read_byte(mtd);
 
-	if ((maf_id == 0x2c) && (dev_id == 0xaa)) {
+	if ((maf_id == 0x2c) && ((dev_id == 0xf1) || (dev_id == 0xa1) || (dev_id == 0xb1) ||
+				(dev_id == 0xaa) || (dev_id == 0xba) ||
+				(dev_id == 0xda) || (dev_id == 0xca) ||
+				(dev_id == 0xac) || (dev_id == 0xbc) ||
+				(dev_id == 0xdc) || (dev_id == 0xcc) ||
+				(dev_id == 0xa3) || (dev_id == 0xb3) ||
+				(dev_id == 0xd3) || (dev_id == 0xc3))) {
+		printf("OnDie ECC flash\n");
 		nand_chip->cmdfunc(mtd, NAND_CMD_SET_FEATURES,
 						ONDIE_ECC_FEATURE_ADDR, -1);
 		nand_chip->write_buf(mtd, set_feature, 4);
@@ -1147,7 +1154,6 @@ int board_nand_init(struct nand_chip *nand_chip)
 			ondie_ecc_enabled = 1;
 	} else if ((nand_chip->onfi_version == 23) &&
 				(nand_chip->onfi_params.features & (1 << 9))) {
-		printk(KERN_INFO "\nClear NAND flash detected\n");
 		ez_nand_supported = 1;
 	}