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

* git://git.infradead.org/mtd-2.6: (120 commits)
  [MTD] Fix mtdoops.c compilation
  [MTD] [NOR] fix startup lock when using multiple nor flash chips
  [MTD] [DOC200x] eccbuf is statically defined and always evaluate to true
  [MTD] Fix maps/physmap.c compilation with CONFIG_PM
  [MTD] onenand: Add panic_write function to the onenand driver
  [MTD] mtdoops: Use the panic_write function when present
  [MTD] Add mtd panic_write function pointer
  [MTD] [NAND] Freescale enhanced Local Bus Controller FCM NAND support.
  [MTD] physmap.c: Add support for multiple resources
  [MTD] [NAND] Fix misparenthesization introduced by commit 78b65179...
  [MTD] [NAND] Fix Blackfin NFC ECC calculating bug with page size 512 bytes
  [MTD] [NAND] Remove wrong operation in PM function of the BF54x NFC driver
  [MTD] [NAND] Remove unused variable in plat_nand_remove
  [MTD] Unlocking all Intel flash that is locked on power up.
  [MTD] [NAND] at91_nand: Make mtdparts option can override board info
  [MTD] mtdoops: Various minor cleanups
  [MTD] mtdoops: Ensure sequential write to the buffer
  [MTD] mtdoops: Perform write operations in a workqueue
  [MTD] mtdoops: Add further error return code checking
  [MTD] [NOR] Test devtype, not definition in flash_probe(), drivers/mtd/devices/lart.c
  ...

1 files changed, 28 insertions, 11 deletions

diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index a52f3a737c39..747042ab094a 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -74,7 +74,22 @@ static int hardware_ecc = 1;
 static int hardware_ecc;
 #endif
 
-static unsigned short bfin_nfc_pin_req[] = {P_NAND_CE, P_NAND_RB, 0};
+static unsigned short bfin_nfc_pin_req[] =
+        {P_NAND_CE,
+         P_NAND_RB,
+         P_NAND_D0,
+         P_NAND_D1,
+         P_NAND_D2,
+         P_NAND_D3,
+         P_NAND_D4,
+         P_NAND_D5,
+         P_NAND_D6,
+         P_NAND_D7,
+         P_NAND_WE,
+         P_NAND_RE,
+         P_NAND_CLE,
+         P_NAND_ALE,
+         0};
 
 /*
  * Data structures for bf5xx nand flash controller driver
@@ -278,7 +293,6 @@ static int bf5xx_nand_calculate_ecc(struct mtd_info *mtd,
         u16 ecc0, ecc1;
         u32 code[2];
         u8 *p;
-        int bytes = 3, i;
 
         /* first 4 bytes ECC code for 256 page size */
         ecc0 = bfin_read_NFC_ECC0();
@@ -288,19 +302,24 @@ static int bf5xx_nand_calculate_ecc(struct mtd_info *mtd,
 
         dev_dbg(info->device, "returning ecc 0x%08x\n", code[0]);
 
+        /* first 3 bytes in ecc_code for 256 page size */
+        p = (u8 *) code;
+        memcpy(ecc_code, p, 3);
+
         /* second 4 bytes ECC code for 512 page size */
         if (page_size == 512) {
                 ecc0 = bfin_read_NFC_ECC2();
                 ecc1 = bfin_read_NFC_ECC3();
                 code[1] = (ecc0 & 0x3FF) | ((ecc1 & 0x3FF) << 11);
-                bytes = 6;
+
+                /* second 3 bytes in ecc_code for second 256
+                 * bytes of 512 page size
+                 */
+                p = (u8 *) (code + 1);
+                memcpy((ecc_code + 3), p, 3);
                 dev_dbg(info->device, "returning ecc 0x%08x\n", code[1]);
         }
 
-        p = (u8 *)code;
-        for (i = 0; i < bytes; i++)
-                ecc_code[i] = p[i];
-
         return 0;
 }
 
@@ -507,12 +526,13 @@ static int bf5xx_nand_dma_init(struct bf5xx_nand_info *info)
 
         init_completion(&info->dma_completion);
 
+#ifdef CONFIG_BF54x
         /* Setup DMAC1 channel mux for NFC which shared with SDH */
         val = bfin_read_DMAC1_PERIMUX();
         val &= 0xFFFE;
         bfin_write_DMAC1_PERIMUX(val);
         SSYNC();
-
+#endif
         /* Request NFC DMA channel */
         ret = request_dma(CH_NFC, "BF5XX NFC driver");
         if (ret < 0) {
@@ -744,9 +764,6 @@ static int bf5xx_nand_resume(struct platform_device *dev)
 {
         struct bf5xx_nand_info *info = platform_get_drvdata(dev);
 
-        if (info)
-                bf5xx_nand_hw_init(info);
-
         return 0;
 }