From: Heiko Schocher <hs@denx.de>
Date: Sun, 4 Dec 2011 09:37:36 +0000 (+0100)
Subject: mtd: davinci: if no amif timing is passed, don; t setup cscfg register
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=47882d78250a8b92a9837d14bab32915622a9f12;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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>
---

diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index c153e1f77f9..6e566156956 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)
 
 	davinci_nand_writel(info, A1CR_OFFSET + info->core_chipsel * 4, val);
 
-	ret = davinci_aemif_setup_timing(info->timing, info->base,
+	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");