diff options
| author | Heiko Schocher | 2011-12-04 10:37:36 +0100 |
|---|---|---|
| committer | David Woodhouse | 2012-01-09 19:13:25 +0100 |
| commit | 47882d78250a8b92a9837d14bab32915622a9f12 (patch) | |
| tree | c499fc32a177aeda595f6e93414222a4ace9e63f /drivers/mtd/nand/davinci_nand.c | |
| parent | mtd: nand: set correct length to FBCR for a non-full-page write (diff) | |
| download | kernel-qcow2-linux-47882d78250a8b92a9837d14bab32915622a9f12.tar.gz kernel-qcow2-linux-47882d78250a8b92a9837d14bab32915622a9f12.tar.xz kernel-qcow2-linux-47882d78250a8b92a9837d14bab32915622a9f12.zip | |
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.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 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) 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"); |