[PATCH] nand, davinci: if no amif timing is passed, don; t setup cscfg register
Heiko Schocher
hs at denx.de
Sun Dec 4 04:37:36 EST 2011
Signed-off-by: Heiko Schocher <hs at denx.de>
Cc: linux-mtd at lists.infradead.org
Cc: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
Cc: David Woodhouse <David.Woodhouse at intel.com>
Cc: David Brownell <dbrownell at users.sourceforge.net>
Cc: Wolfgang Denk <wd at denx.de>
---
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");
--
1.7.6.4
More information about the linux-mtd
mailing list