summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEgli, Samuel <samuel.egli@siemens.com>2015-02-13 15:47:10 +0100
committerTom Rini <trini@ti.com>2015-02-16 12:41:40 -0500
commit89831112d46fb19127f3de9cec781e5a9c28b281 (patch)
treef1b122ae7a8acdc6fdbf155d3f6e1b2d926cf224 /drivers
parent5745f8c4fd5807becf7f246625e153388293aedc (diff)
downloadblackbird-obmc-uboot-89831112d46fb19127f3de9cec781e5a9c28b281.tar.gz
blackbird-obmc-uboot-89831112d46fb19127f3de9cec781e5a9c28b281.zip
mtd, omap: fix case NAND_OMAP_GPMC_PREFETCH not defined
The patch c316f577b4b72d1a1aeb559e9b3fad20808f1ffd breaks siemens boards because prefetch mode is not enabled. I assume it breaks other boards as well that don't use prefetch. This patch sets read_buf to nand_read_buf if NAND_OMAP_GPMC_PREFETCH is not defined. Signed-off-by: Samuel Egli <samuel.egli@siemens.com> CC: Daniel Mack <zonque@gmail.com> CC: Guido Martínez <guido@vanguardiasur.com.ar> CC: Tom Rini <trini@ti.com> CC: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/omap_gpmc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c
index fc64f48144..24123fcfe5 100644
--- a/drivers/mtd/nand/omap_gpmc.c
+++ b/drivers/mtd/nand/omap_gpmc.c
@@ -989,12 +989,15 @@ int board_nand_init(struct nand_chip *nand)
if (err)
return err;
-#ifdef CONFIG_NAND_OMAP_GPMC_PREFETCH
/* TODO: Implement for 16-bit bus width */
if (nand->options & NAND_BUSWIDTH_16)
nand->read_buf = nand_read_buf16;
+#ifdef CONFIG_NAND_OMAP_GPMC_PREFETCH
else
nand->read_buf = omap_nand_read_prefetch8;
+#else
+ else
+ nand->read_buf = nand_read_buf;
#endif
nand->dev_ready = omap_dev_ready;
OpenPOWER on IntegriCloud