aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/davinci_nand.c
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2011-12-04 04:37:36 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-01-09 13:13:25 -0500
commit47882d78250a8b92a9837d14bab32915622a9f12 (patch)
treec499fc32a177aeda595f6e93414222a4ace9e63f /drivers/mtd/nand/davinci_nand.c
parente32de766c2eb65f775438dd6d8ec5007619d2fe5 (diff)
mtd: davinci: if no amif timing is passed, don; t setup cscfg register
Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/davinci_nand.c')
-rw-r--r--drivers/mtd/nand/davinci_nand.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index c153e1f77f90..6e566156956f 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -675,7 +675,9 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
675 675
676 davinci_nand_writel(info, A1CR_OFFSET + info->core_chipsel * 4, val); 676 davinci_nand_writel(info, A1CR_OFFSET + info->core_chipsel * 4, val);
677 677
678 ret = davinci_aemif_setup_timing(info->timing, info->base, 678 ret = 0;
679 if (info->timing)
680 ret = davinci_aemif_setup_timing(info->timing, info->base,
679 info->core_chipsel); 681 info->core_chipsel);
680 if (ret < 0) { 682 if (ret < 0) {
681 dev_dbg(&pdev->dev, "NAND timing values setup fail\n"); 683 dev_dbg(&pdev->dev, "NAND timing values setup fail\n");