From: Joe Hershberger <joe.hershberger@ni.com>
Date: Wed, 21 Mar 2012 18:47:18 +0000 (-0500)
Subject: Xilinx: ARM: Update NAND driver to match nand_scan_ident()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=240de63e8857c32e6af016cd44eb32df48366809;p=thirdparty%2Fu-boot.git

Xilinx: ARM: Update NAND driver to match nand_scan_ident()

nand_scan_ident() has been updated to match Linux...
Remove special case.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/board/xilinx/dfe/xilinx_nandpss.c b/board/xilinx/dfe/xilinx_nandpss.c
index 0b8fa102648..99eb9a005e3 100644
--- a/board/xilinx/dfe/xilinx_nandpss.c
+++ b/board/xilinx/dfe/xilinx_nandpss.c
@@ -1117,11 +1117,7 @@ int board_nand_init(struct nand_chip *nand_chip)
 	xnandpss_init_nand_flash(xnand->smc_regs, nand_chip->options);
 
 	/* first scan to find the device and get the page size */
-#ifdef LINUX_ONLY_NOT_UBOOT
 	if (nand_scan_ident(mtd, 1, NULL)) {
-#else
-	if (nand_scan_ident(mtd, 1)) {
-#endif
 		err = -ENXIO;
 		dev_err(&pdev->dev, "nand_scan_ident for NAND failed\n");
 		goto out_unmap_all_mem;