From 0b54f2cdb17bbf9fa74c1b4c109275ddb14e6803 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 31 Mar 2010 08:24:17 +0200 Subject: nand_imx: clear INT_MSK to fix i.MX21 nand boot For some weird reason this fixes nand boot on i.MX21. Since interrupts are globally disabled it doesn't hurt on other SoCs. Signed-off-by: Sascha Hauer --- drivers/nand/nand_imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c index afd5637626..5c910d8ecb 100644 --- a/drivers/nand/nand_imx.c +++ b/drivers/nand/nand_imx.c @@ -1085,11 +1085,11 @@ void __nand_boot_init imx_nand_load_image(void *dest, int size) writew(0x4, host.regs + NFC_WRPROT); tmp = readw(host.regs + NFC_CONFIG1); - tmp |= NFC_ECC_EN | NFC_INT_MSK; + tmp |= NFC_ECC_EN; if (nfc_is_v21()) /* currently no support for 218 byte OOB with stronger ECC */ tmp |= NFC_ECC_MODE; - tmp &= ~NFC_SP_EN; + tmp &= ~(NFC_SP_EN | NFC_INT_MSK); writew(tmp, host.regs + NFC_CONFIG1); if (nfc_is_v21()) { -- cgit v1.2.3