From patchwork Sun Dec 4 09:37:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: nand, davinci: if no amif timing is passed, don; t setup cscfg register Date: Sat, 03 Dec 2011 23:37:36 -0000 From: Heiko Schocher X-Patchwork-Id: 129131 Message-Id: <1322991456-20690-1-git-send-email-hs@denx.de> To: Cc: Artem Bityutskiy , David Brownell , David Woodhouse , linux-mtd@lists.infradead.org, Heiko Schocher Signed-off-by: Heiko Schocher Cc: linux-mtd@lists.infradead.org Cc: Artem Bityutskiy Cc: David Woodhouse Cc: David Brownell Cc: Wolfgang Denk --- drivers/mtd/nand/davinci_nand.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index c153e1f..6e56615 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");