Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / board / freescale / m5373evb / nand.c

diff --git a/board/freescale/m5373evb/nand.c b/board/freescale/m5373evb/nand.c
index 3ebef059e14d5fe1484792959de69e941fa05916..df8c03b8a272677f05e51178bca15450d163f928 100644 (file)
--- a/board/freescale/m5373evb/nand.c
+++ b/board/freescale/m5373evb/nand.c
@@ -47,10 +47,12 @@ static void nand_hwcontrol(struct mtd_info *mtdinfo, int cmd, unsigned int ctrl)
                ulong IO_ADDR_W = (ulong) this->IO_ADDR_W;
 
                IO_ADDR_W &= ~(SET_ALE | SET_CLE);
-               *nCE &= 0xFFFB;
 
                if (ctrl & NAND_NCE)
+                       *nCE &= 0xFFFB;
+               else
                        *nCE |= 0x0004;
+
                if (ctrl & NAND_CLE)
                        IO_ADDR_W |= SET_CLE;
                if (ctrl & NAND_ALE)
@@ -82,7 +84,7 @@ int board_nand_init(struct nand_chip *nand)
        gpio->pclrr_timer = 0;
        gpio->podr_timer = 0;
 
-       nand->chip_delay = 50;
+       nand->chip_delay = 60;
        nand->ecc.mode = NAND_ECC_SOFT;
        nand->cmd_ctrl = nand_hwcontrol;