mtd: OMAP: Enable GPMC prefetch mode for 16 bit access

commit c316f57 "mtd: OMAP: Enable GPMC prefetch mode" only enabled
prefetch mode for 8 bit nand access, this adds 16 bit as well.

Cc: Scott Wood <scottwood@freescale.com>
Cc: Tom Rini <trini@konsulko.com>
Cc: Daniel Mack <zonque@gmail.com>
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c
index 1145650d61d4b7683cd3d0ccc9a622db86c56cc4..e2bfd3e1159ced243d71dfcd1ecc0f1fe658b5a1 100644 (file)
--- a/drivers/mtd/nand/omap_gpmc.c
+++ b/drivers/mtd/nand/omap_gpmc.c
@@ -597,7 +597,17 @@ static int __read_prefetch_aligned(struct nand_chip *chip, uint32_t *buf, int le
        return 0;
 }
 
-static void omap_nand_read_prefetch8(struct mtd_info *mtd, uint8_t *buf, int len)
+static inline void omap_nand_read(struct mtd_info *mtd, uint8_t *buf, int len)
+{
+       struct nand_chip *chip = mtd->priv;
+
+       if (chip->options & NAND_BUSWIDTH_16)
+               nand_read_buf16(mtd, buf, len);
+       else
+               nand_read_buf(mtd, buf, len);
+}
+
+static void omap_nand_read_prefetch(struct mtd_info *mtd, uint8_t *buf, int len)
 {
        int ret;
        uint32_t head, tail;
@@ -609,7 +619,7 @@ static void omap_nand_read_prefetch8(struct mtd_info *mtd, uint8_t *buf, int len
         */
        head = ((uint32_t) buf) % 4;
        if (head) {
-               nand_read_buf(mtd, buf, head);
+               omap_nand_read(mtd, buf, head);
                buf += head;
                len -= head;
        }
@@ -620,13 +630,13 @@ static void omap_nand_read_prefetch8(struct mtd_info *mtd, uint8_t *buf, int len
         */
        tail = len % 4;
 
-       ret = __read_prefetch_aligned(chip, (uint32_t *) buf, len - tail);
+       ret = __read_prefetch_aligned(chip, (uint32_t *)buf, len - tail);
        if (ret < 0) {
                /* fallback in case the prefetch engine is busy */
-               nand_read_buf(mtd, buf, len);
+               omap_nand_read(mtd, buf, len);
        } else if (tail) {
                buf += len - tail;
-               nand_read_buf(mtd, buf, tail);
+               omap_nand_read(mtd, buf, tail);
        }
 }
 #endif /* CONFIG_NAND_OMAP_GPMC_PREFETCH */
@@ -1213,13 +1223,11 @@ int board_nand_init(struct nand_chip *nand)
        nand->bbt_md = &bbt_mirror_descr;
 #endif
 
-       /* 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;
+       nand->read_buf = omap_nand_read_prefetch;
 #else
+       if (nand->options & NAND_BUSWIDTH_16)
+               nand->read_buf = nand_read_buf16;
        else
                nand->read_buf = nand_read_buf;
 #endif