Merge tag 'for-linus-20140405' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / nand / davinci_nand.c

diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index a4989ec6292efa0127ba4cc84d13fd07ad09fe4b..4615d79fc93f795c869687117744e01653219478 100644 (file)
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -24,7 +24,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/err.h>
@@ -746,28 +745,6 @@ static int nand_davinci_probe(struct platform_device *pdev)
                goto err_clk_enable;
        }
 
-       /*
-        * Setup Async configuration register in case we did not boot from
-        * NAND and so bootloader did not bother to set it up.
-        */
-       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 = 0;
-       if (info->timing)
-               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;
-       }
-
        spin_lock_irq(&davinci_nand_lock);
 
        /* put CSxNAND into NAND mode */