From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 19 Feb 2007 21:34:11 +0000 (-0800)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: v2.6.21-rc1~66
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=4935361766cc73949fe032cd157d314f288922ba;p=net-next-2.6.git

Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (49 commits)
  [MTD] [NAND] S3C2412 fix hw ecc
  [MTD] [NAND] Work around false compiler warning in CAFÉ driver
  [JFFS2] printk warning fixes
  [MTD] [MAPS] ichxrom warning fix
  [MTD] [MAPS] amd76xrom warning fix
  [MTD] [MAPS] esb2rom warning fixes
  [MTD] [MAPS] ck804xrom warning fix
  [MTD] [MAPS] netsc520 warning fix
  [MTD] [MAPS] sc520cdp warning fix
  [MTD] [ONENAND] onenand_base warning fix
  [MTD] [NAND] eXcite nand flash driver
  [MTD] Improve heuristic for detecting wrong-endian RedBoot partition table
  [MTD] Fix RedBoot partition parsing regression harder.
  [MTD] [NAND] S3C2410: Hardware ECC correction code
  [JFFS2] Use MTD_OOB_AUTO to automatically place cleanmarker on NAND
  [MTD] Clarify OOB-operation interface comments
  [MTD] remove unused ecctype,eccsize fields from struct mtd_info
  [MTD] [NOR] Intel: remove ugly PROGREGION macros
  [MTD] [NOR] STAA: use writesize instead off eccsize to represent ECC block
  [MTD] OneNAND: Invalidate bufferRAM after erase
  ...
---

4935361766cc73949fe032cd157d314f288922ba
diff --cc drivers/mtd/nand/cafe.c
index 08cb060dfa3,5ec82beb49d..fd6bb3ed40d
--- a/drivers/mtd/nand/cafe.c
+++ b/drivers/mtd/nand/cafe.c
@@@ -584,27 -609,17 +609,18 @@@ static int __devinit cafe_nand_probe(st
  	cafe_writel(cafe, 1, NAND_RESET);
  	cafe_writel(cafe, 0, NAND_RESET);
  
- 	cafe_writel(cafe, 0xffffffff, NAND_IRQ_MASK);
+ 	cafe_writel(cafe, timing1, NAND_TIMING1);
+ 	cafe_writel(cafe, timing2, NAND_TIMING2);
+ 	cafe_writel(cafe, timing3, NAND_TIMING3);
  
- 	/* Timings from Marvell's test code (not verified or calculated by us) */
- 	if (!slowtiming) {
- 		cafe_writel(cafe, 0x01010a0a, NAND_TIMING1);
- 		cafe_writel(cafe, 0x24121212, NAND_TIMING2);
- 		cafe_writel(cafe, 0x11000000, NAND_TIMING3);
- 	} else {
- 		cafe_writel(cafe, 0xffffffff, NAND_TIMING1);
- 		cafe_writel(cafe, 0xffffffff, NAND_TIMING2);
- 		cafe_writel(cafe, 0xffffffff, NAND_TIMING3);
- 	}
  	cafe_writel(cafe, 0xffffffff, NAND_IRQ_MASK);
 -	err = request_irq(pdev->irq, &cafe_nand_interrupt, SA_SHIRQ, "CAFE NAND", mtd);
 +	err = request_irq(pdev->irq, &cafe_nand_interrupt, IRQF_SHARED,
 +			  "CAFE NAND", mtd);
  	if (err) {
  		dev_warn(&pdev->dev, "Could not register IRQ %d\n", pdev->irq);
- 
  		goto out_free_dma;
  	}
- #if 1
+ 
  	/* Disable master reset, enable NAND clock */
  	ctrl = cafe_readl(cafe, GLOBAL_CTRL);
  	ctrl &= 0xffffeff0;