From 523123e9666ea021644cb0ba4420dd2ca1d8be2b Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 27 Oct 2006 09:55:34 +0300 Subject: [PATCH] --- yaml --- r: 45651 b: refs/heads/master c: dcc41bc81c872862652d68af8993b9fa32ce56a4 h: refs/heads/master i: 45649: 2b4a210bd1eeda35d11c3a83b0a4ac19b1501c75 45647: 40aec123c5957008f45b2427e7467df2ce071eb7 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/cafe.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e281052595a5..66f06e143088 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c8cfdcbeb1ab0ec7bbd5af1be311b55281154c4 +refs/heads/master: dcc41bc81c872862652d68af8993b9fa32ce56a4 diff --git a/trunk/drivers/mtd/nand/cafe.c b/trunk/drivers/mtd/nand/cafe.c index 6bcb430b951c..dd274c877b5e 100644 --- a/trunk/drivers/mtd/nand/cafe.c +++ b/trunk/drivers/mtd/nand/cafe.c @@ -598,6 +598,10 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev, cafe->nand.block_bad = cafe_nand_block_bad; } + /* Start off by resetting the NAND controller completely */ + writel(1, cafe->mmio + 0x3034); + writel(0, cafe->mmio + 0x3034); + /* Timings from Marvell's test code (not verified or calculated by us) */ writel(0xffffffff, cafe->mmio + CAFE_NAND_IRQ_MASK); #if 1