mtd: rawnand: brcmnand: Add BCMBCA read data bus interface

[linux-2.6-microblaze.git] / drivers / mtd / nand / raw / brcmnand / brcmnand.c

diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index f1f0de5..ef7d340 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -851,6 +851,20 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
        return brcmnand_readl(ctrl->edu_base + offs);
 }
 
+static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
+                                         void __iomem *flash_cache, u32 *buffer, int fc_words)
+{
+       struct brcmnand_soc *soc = ctrl->soc;
+       int i;
+
+       if (soc->read_data_bus) {
+               soc->read_data_bus(soc, flash_cache, buffer, fc_words);
+       } else {
+               for (i = 0; i < fc_words; i++)
+                       buffer[i] = brcmnand_read_fc(ctrl, i);
+       }
+}
+
 static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
 {
 
@@ -1975,7 +1989,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
 {
        struct brcmnand_host *host = nand_get_controller_data(chip);
        struct brcmnand_controller *ctrl = host->ctrl;
-       int i, j, ret = 0;
+       int i, ret = 0;
 
        brcmnand_clear_ecc_addr(ctrl);
 
@@ -1988,8 +2002,8 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
                if (likely(buf)) {
                        brcmnand_soc_data_bus_prepare(ctrl->soc, false);
 
-                       for (j = 0; j < FC_WORDS; j++, buf++)
-                               *buf = brcmnand_read_fc(ctrl, j);
+                       brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf, FC_WORDS);
+                       buf += FC_WORDS;
 
                        brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
                }