1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 7db573e9bf78..d29479abe504 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -166,15 +166,22 @@ static void set_addr(struct mtd_info *mtd, int column, int page_addr, int oob)
 
         elbc_fcm_ctrl->page = page_addr;
 
-        out_be32(&lbc->fbar,
-                 page_addr >> (chip->phys_erase_shift - chip->page_shift));
-
         if (priv->page_size) {
+                /*
+                 * large page size chip : FPAR[PI] save the lowest 6 bits,
+                 *                        FBAR[BLK] save the other bits.
+                 */
+                out_be32(&lbc->fbar, page_addr >> 6);
                 out_be32(&lbc->fpar,
                          ((page_addr << FPAR_LP_PI_SHIFT) & FPAR_LP_PI) |
                          (oob ? FPAR_LP_MS : 0) | column);
                 buf_num = (page_addr & 1) << 2;
         } else {
+                /*
+                 * small page size chip : FPAR[PI] save the lowest 5 bits,
+                 *                        FBAR[BLK] save the other bits.
+                 */
+                out_be32(&lbc->fbar, page_addr >> 5);
                 out_be32(&lbc->fpar,
                          ((page_addr << FPAR_SP_PI_SHIFT) & FPAR_SP_PI) |
                          (oob ? FPAR_SP_MS : 0) | column);