summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-03-31 08:24:17 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-03-31 08:24:20 +0200
commit0b54f2cdb17bbf9fa74c1b4c109275ddb14e6803 (patch)
tree9ad2e51f73263b477804554a9550ca2a1d0ab662 /drivers
parentf4a5a3966355b63432cfea594aa74b55d4338a7c (diff)
downloadbarebox-0b54f2cdb17bbf9fa74c1b4c109275ddb14e6803.tar.gz
barebox-0b54f2cdb17bbf9fa74c1b4c109275ddb14e6803.tar.xz
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 <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nand/nand_imx.c4
1 files changed, 2 insertions, 2 deletions
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()) {