* [PATCH] nand, davinci: if no amif timing is passed, don; t setup cscfg register
@ 2011-12-04 9:37 Heiko Schocher
2011-12-05 6:53 ` Artem Bityutskiy
0 siblings, 1 reply; 2+ messages in thread
From: Heiko Schocher @ 2011-12-04 9:37 UTC (permalink / raw)
Cc: Artem Bityutskiy, David Brownell, David Woodhouse, linux-mtd,
Heiko Schocher
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: linux-mtd@lists.infradead.org
Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Cc: David Woodhouse <David.Woodhouse@intel.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Wolfgang Denk <wd@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] nand, davinci: if no amif timing is passed, don; t setup cscfg register
2011-12-04 9:37 [PATCH] nand, davinci: if no amif timing is passed, don; t setup cscfg register Heiko Schocher
@ 2011-12-05 6:53 ` Artem Bityutskiy
0 siblings, 0 replies; 2+ messages in thread
From: Artem Bityutskiy @ 2011-12-05 6:53 UTC (permalink / raw)
To: Heiko Schocher; +Cc: linux-mtd
Pushed to l2-mtd-2.6.git, thanks!
Artem.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-05 6:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-04 9:37 [PATCH] nand, davinci: if no amif timing is passed, don; t setup cscfg register Heiko Schocher
2011-12-05 6:53 ` Artem Bityutskiy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox