From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Thu, 10 Sep 2009 06:27:23 +0000 (+0800)
Subject: pxa3xx_nand: disable nand irq in initialization
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=346e125967c39fc25263f3071dfc88224ae843f4;p=deliverable%2Flinux.git

pxa3xx_nand: disable nand irq in initialization

In some bootloader, IRQ is enabled. Writing nand triggers unexpected
interrupts. So disable nand irq in initialization. After nand
initialized and in working state, irq is controlled by nand driver.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index e75b1bf6df12..11f32454fc77 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1244,6 +1244,9 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
 	if (ret)
 		goto fail_free_io;
 
+	/* initialize all interrupts to be disabled */
+	disable_int(info, NDSR_MASK);
+
 	ret = request_irq(irq, pxa3xx_nand_irq, IRQF_DISABLED,
 			  pdev->name, info);
 	if (ret < 0) {