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, 33 insertions, 15 deletions

diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 2bd0737572c6..9260ad947524 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -120,6 +120,8 @@ struct s3c2410_nand_info {
         int                             sel_bit;
         int                             mtd_count;
 
+        unsigned long                   save_nfconf;
+
         enum s3c_cpu_type               cpu_type;
 };
 
@@ -364,23 +366,21 @@ static int s3c2410_nand_correct_data(struct mtd_info *mtd, u_char *dat,
             ((diff2 ^ (diff2 >> 1)) & 0x55) == 0x55) {
                 /* calculate the bit position of the error */
 
-                bit  = (diff2 >> 2) & 1;
-                bit |= (diff2 >> 3) & 2;
-                bit |= (diff2 >> 4) & 4;
+                bit  = ((diff2 >> 3) & 1) |
+                       ((diff2 >> 4) & 2) |
+                       ((diff2 >> 5) & 4);
 
                 /* calculate the byte position of the error */
 
-                byte  = (diff1 << 1) & 0x80;
-                byte |= (diff1 << 2) & 0x40;
-                byte |= (diff1 << 3) & 0x20;
-                byte |= (diff1 << 4) & 0x10;
-
-                byte |= (diff0 >> 3) & 0x08;
-                byte |= (diff0 >> 2) & 0x04;
-                byte |= (diff0 >> 1) & 0x02;
-                byte |= (diff0 >> 0) & 0x01;
-
-                byte |= (diff2 << 8) & 0x100;
+                byte = ((diff2 << 7) & 0x100) |
+                       ((diff1 << 0) & 0x80)  |
+                       ((diff1 << 1) & 0x40)  |
+                       ((diff1 << 2) & 0x20)  |
+                       ((diff1 << 3) & 0x10)  |
+                       ((diff0 >> 4) & 0x08)  |
+                       ((diff0 >> 3) & 0x04)  |
+                       ((diff0 >> 2) & 0x02)  |
+                       ((diff0 >> 1) & 0x01);
 
                 dev_dbg(info->device, "correcting error bit %d, byte %d\n",
                         bit, byte);
@@ -399,7 +399,7 @@ static int s3c2410_nand_correct_data(struct mtd_info *mtd, u_char *dat,
         if ((diff0 & ~(1<<fls(diff0))) == 0)
                 return 1;
 
-        return 0;
+        return -1;
 }
 
 /* ECC functions
@@ -810,6 +810,16 @@ static int s3c24xx_nand_suspend(struct platform_device *dev, pm_message_t pm)
         struct s3c2410_nand_info *info = platform_get_drvdata(dev);
 
         if (info) {
+                info->save_nfconf = readl(info->regs + S3C2410_NFCONF);
+
+                /* For the moment, we must ensure nFCE is high during
+                 * the time we are suspended. This really should be
+                 * handled by suspending the MTDs we are using, but
+                 * that is currently not the case. */
+
+                writel(info->save_nfconf | info->sel_bit,
+                       info->regs + S3C2410_NFCONF);
+
                 if (!allow_clk_stop(info))
                         clk_disable(info->clk);
         }
@@ -820,11 +830,19 @@ static int s3c24xx_nand_suspend(struct platform_device *dev, pm_message_t pm)
 static int s3c24xx_nand_resume(struct platform_device *dev)
 {
         struct s3c2410_nand_info *info = platform_get_drvdata(dev);
+        unsigned long nfconf;
 
         if (info) {
                 clk_enable(info->clk);
                 s3c2410_nand_inithw(info, dev);
 
+                /* Restore the state of the nFCE line. */
+
+                nfconf = readl(info->regs + S3C2410_NFCONF);
+                nfconf &= ~info->sel_bit;
+                nfconf |= info->save_nfconf & info->sel_bit;
+                writel(nfconf, info->regs + S3C2410_NFCONF);
+
                 if (allow_clk_stop(info))
                         clk_disable(info->clk);
         }