3 files changed, 49 insertions, 76 deletions

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 3eff1e562ad3..4759d827e8c7 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -1131,17 +1131,15 @@ static const struct file_operations mtd_fops = {
 #endif
 };
 
-static int mtd_inodefs_get_sb(struct file_system_type *fs_type, int flags,
-                               const char *dev_name, void *data,
-                               struct vfsmount *mnt)
+static struct dentry *mtd_inodefs_mount(struct file_system_type *fs_type,
+                                int flags, const char *dev_name, void *data)
 {
-        return get_sb_pseudo(fs_type, "mtd_inode:", NULL, MTD_INODE_FS_MAGIC,
-                             mnt);
+        return mount_pseudo(fs_type, "mtd_inode:", NULL, MTD_INODE_FS_MAGIC);
 }
 
 static struct file_system_type mtd_inodefs_type = {
        .name = "mtd_inodefs",
-       .get_sb = mtd_inodefs_get_sb,
+       .mount = mtd_inodefs_mount,
        .kill_sb = kill_anon_super,
 };
 
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c
index 38e2ab07e7a3..16b02a1fc100 100644
--- a/drivers/mtd/mtdsuper.c
+++ b/drivers/mtd/mtdsuper.c
@@ -54,11 +54,10 @@ static int get_sb_mtd_set(struct super_block *sb, void *_mtd)
 /*
  * get a superblock on an MTD-backed filesystem
  */
-static int get_sb_mtd_aux(struct file_system_type *fs_type, int flags,
+static struct dentry *mount_mtd_aux(struct file_system_type *fs_type, int flags,
                           const char *dev_name, void *data,
                           struct mtd_info *mtd,
-                          int (*fill_super)(struct super_block *, void *, int),
-                          struct vfsmount *mnt)
+                          int (*fill_super)(struct super_block *, void *, int))
 {
         struct super_block *sb;
         int ret;
@@ -79,57 +78,49 @@ static int get_sb_mtd_aux(struct file_system_type *fs_type, int flags,
         ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0);
         if (ret < 0) {
                 deactivate_locked_super(sb);
-                return ret;
+                return ERR_PTR(ret);
         }
 
         /* go */
         sb->s_flags |= MS_ACTIVE;
-        simple_set_mnt(mnt, sb);
-
-        return 0;
+        return dget(sb->s_root);
 
         /* new mountpoint for an already mounted superblock */
 already_mounted:
         DEBUG(1, "MTDSB: Device %d (\"%s\") is already mounted\n",
               mtd->index, mtd->name);
-        simple_set_mnt(mnt, sb);
-        ret = 0;
-        goto out_put;
+        put_mtd_device(mtd);
+        return dget(sb->s_root);
 
 out_error:
-        ret = PTR_ERR(sb);
-out_put:
         put_mtd_device(mtd);
-        return ret;
+        return ERR_CAST(sb);
 }
 
 /*
  * get a superblock on an MTD-backed filesystem by MTD device number
  */
-static int get_sb_mtd_nr(struct file_system_type *fs_type, int flags,
+static struct dentry *mount_mtd_nr(struct file_system_type *fs_type, int flags,
                          const char *dev_name, void *data, int mtdnr,
-                         int (*fill_super)(struct super_block *, void *, int),
-                         struct vfsmount *mnt)
+                         int (*fill_super)(struct super_block *, void *, int))
 {
         struct mtd_info *mtd;
 
         mtd = get_mtd_device(NULL, mtdnr);
         if (IS_ERR(mtd)) {
                 DEBUG(0, "MTDSB: Device #%u doesn't appear to exist\n", mtdnr);
-                return PTR_ERR(mtd);
+                return ERR_CAST(mtd);
         }
 
-        return get_sb_mtd_aux(fs_type, flags, dev_name, data, mtd, fill_super,
-                              mnt);
+        return mount_mtd_aux(fs_type, flags, dev_name, data, mtd, fill_super);
 }
 
 /*
  * set up an MTD-based superblock
  */
-int get_sb_mtd(struct file_system_type *fs_type, int flags,
+struct dentry *mount_mtd(struct file_system_type *fs_type, int flags,
                const char *dev_name, void *data,
-               int (*fill_super)(struct super_block *, void *, int),
-               struct vfsmount *mnt)
+               int (*fill_super)(struct super_block *, void *, int))
 {
 #ifdef CONFIG_BLOCK
         struct block_device *bdev;
@@ -138,7 +129,7 @@ int get_sb_mtd(struct file_system_type *fs_type, int flags,
         int mtdnr;
 
         if (!dev_name)
-                return -EINVAL;
+                return ERR_PTR(-EINVAL);
 
         DEBUG(2, "MTDSB: dev_name \"%s\"\n", dev_name);
 
@@ -156,10 +147,10 @@ int get_sb_mtd(struct file_system_type *fs_type, int flags,
 
                         mtd = get_mtd_device_nm(dev_name + 4);
                         if (!IS_ERR(mtd))
-                                return get_sb_mtd_aux(
+                                return mount_mtd_aux(
                                         fs_type, flags,
                                         dev_name, data, mtd,
-                                        fill_super, mnt);
+                                        fill_super);
 
                         printk(KERN_NOTICE "MTD:"
                                " MTD device with name \"%s\" not found.\n",
@@ -174,9 +165,9 @@ int get_sb_mtd(struct file_system_type *fs_type, int flags,
                                 /* It was a valid number */
                                 DEBUG(1, "MTDSB: mtd%%d, mtdnr %d\n",
                                       mtdnr);
-                                return get_sb_mtd_nr(fs_type, flags,
+                                return mount_mtd_nr(fs_type, flags,
                                                      dev_name, data,
-                                                     mtdnr, fill_super, mnt);
+                                                     mtdnr, fill_super);
                         }
                 }
         }
@@ -189,7 +180,7 @@ int get_sb_mtd(struct file_system_type *fs_type, int flags,
         if (IS_ERR(bdev)) {
                 ret = PTR_ERR(bdev);
                 DEBUG(1, "MTDSB: lookup_bdev() returned %d\n", ret);
-                return ret;
+                return ERR_PTR(ret);
         }
         DEBUG(1, "MTDSB: lookup_bdev() returned 0\n");
 
@@ -202,8 +193,7 @@ int get_sb_mtd(struct file_system_type *fs_type, int flags,
         if (major != MTD_BLOCK_MAJOR)
                 goto not_an_MTD_device;
 
-        return get_sb_mtd_nr(fs_type, flags, dev_name, data, mtdnr, fill_super,
-                             mnt);
+        return mount_mtd_nr(fs_type, flags, dev_name, data, mtdnr, fill_super);
 
 not_an_MTD_device:
 #endif /* CONFIG_BLOCK */
@@ -212,10 +202,10 @@ not_an_MTD_device:
                 printk(KERN_NOTICE
                        "MTD: Attempt to mount non-MTD device \"%s\"\n",
                        dev_name);
-        return -EINVAL;
+        return ERR_PTR(-EINVAL);
 }
 
-EXPORT_SYMBOL_GPL(get_sb_mtd);
+EXPORT_SYMBOL_GPL(mount_mtd);
 
 /*
  * destroy an MTD-based superblock
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index ad51f8ef0d4f..a90fde3ede28 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -35,6 +35,7 @@
 #include <linux/slab.h>
 
 #include <mach/nand.h>
+#include <mach/aemif.h>
 
 #include <asm/mach-types.h>
 
@@ -74,6 +75,8 @@ struct davinci_nand_info {
         uint32_t                mask_cle;
 
         uint32_t                core_chipsel;
+
+        struct davinci_aemif_timing     *timing;
 };
 
 static DEFINE_SPINLOCK(davinci_nand_lock);
@@ -480,36 +483,6 @@ static int nand_davinci_dev_ready(struct mtd_info *mtd)
         return davinci_nand_readl(info, NANDFSR_OFFSET) & BIT(0);
 }
 
-static void __init nand_dm6446evm_flash_init(struct davinci_nand_info *info)
-{
-        uint32_t regval, a1cr;
-
-        /*
-         * NAND FLASH timings @ PLL1 == 459 MHz
-         *  - AEMIF.CLK freq   = PLL1/6 = 459/6 = 76.5 MHz
-         *  - AEMIF.CLK period = 1/76.5 MHz = 13.1 ns
-         */
-        regval = 0
-                | (0 << 31)           /* selectStrobe */
-                | (0 << 30)           /* extWait (never with NAND) */
-                | (1 << 26)           /* writeSetup      10 ns */
-                | (3 << 20)           /* writeStrobe     40 ns */
-                | (1 << 17)           /* writeHold       10 ns */
-                | (0 << 13)           /* readSetup       10 ns */
-                | (3 << 7)            /* readStrobe      60 ns */
-                | (0 << 4)            /* readHold        10 ns */
-                | (3 << 2)            /* turnAround      ?? ns */
-                | (0 << 0)            /* asyncSize       8-bit bus */
-                ;
-        a1cr = davinci_nand_readl(info, A1CR_OFFSET);
-        if (a1cr != regval) {
-                dev_dbg(info->dev, "Warning: NAND config: Set A1CR " \
-                       "reg to 0x%08x, was 0x%08x, should be done by " \
-                       "bootloader.\n", regval, a1cr);
-                davinci_nand_writel(info, A1CR_OFFSET, regval);
-        }
-}
-
 /*----------------------------------------------------------------------*/
 
 /* An ECC layout for using 4-bit ECC with small-page flash, storing
@@ -613,6 +586,7 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
         info->chip.options      = pdata->options;
         info->chip.bbt_td       = pdata->bbt_td;
         info->chip.bbt_md       = pdata->bbt_md;
+        info->timing            = pdata->timing;
 
         info->ioaddr            = (uint32_t __force) vaddr;
 
@@ -690,15 +664,25 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
                 goto err_clk_enable;
         }
 
-        /* EMIF timings should normally be set by the boot loader,
-         * especially after boot-from-NAND.  The *only* reason to
-         * have this special casing for the DM6446 EVM is to work
-         * with boot-from-NOR ... with CS0 manually re-jumpered
-         * (after startup) so it addresses the NAND flash, not NOR.
-         * Even for dev boards, that's unusually rude...
+        /*
+         * Setup Async configuration register in case we did not boot from
+         * NAND and so bootloader did not bother to set it up.
          */
-        if (machine_is_davinci_evm())
-                nand_dm6446evm_flash_init(info);
+        val = davinci_nand_readl(info, A1CR_OFFSET + info->core_chipsel * 4);
+
+        /* Extended Wait is not valid and Select Strobe mode is not used */
+        val &= ~(ACR_ASIZE_MASK | ACR_EW_MASK | ACR_SS_MASK);
+        if (info->chip.options & NAND_BUSWIDTH_16)
+                val |= 0x1;
+
+        davinci_nand_writel(info, A1CR_OFFSET + info->core_chipsel * 4, val);
+
+        ret = davinci_aemif_setup_timing(info->timing, info->base,
+                                                        info->core_chipsel);
+        if (ret < 0) {
+                dev_dbg(&pdev->dev, "NAND timing values setup fail\n");
+                goto err_timing;
+        }
 
         spin_lock_irq(&davinci_nand_lock);
 
@@ -814,6 +798,7 @@ syndrome_done:
         return 0;
 
 err_scan:
+err_timing:
         clk_disable(info->clk);
 
 err_clk_enable: