diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c
index 8c95d2c..fe1158d 100644
--- a/drivers/spi/spi-fsl-qspi.c
+++ b/drivers/spi/spi-fsl-qspi.c
@@ -498,15 +498,17 @@ static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_device *spi)
         * We use the SFA1AD, SFA2AD, SFB1AD, SFB2AD registers to select
         * the chip we want to access.
         */
+       /*
        for (i = 0; i < 4; i++) {
                if (i < spi->chip_select)
                        map_addr = q->memmap_phy;
                else
                        map_addr = q->memmap_phy +
-                                  2 * q->devtype_data->ahb_buf_size;
+                                  q->devtype_data->ahb_buf_size;
 
                qspi_writel(q, map_addr, q->iobase + QUADSPI_SFA1AD + (i * 4));
        }
+       */
 
        if (needs_4x_clock(q))
                rate *= 4;
@@ -528,7 +530,9 @@ static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_device *spi)
 
 static void fsl_qspi_read_ahb(struct fsl_qspi *q, const struct spi_mem_op *op)
 {
-       memcpy_fromio(op->data.buf.in, q->ahb_addr, op->data.nbytes);
+       memcpy_fromio(op->data.buf.in,
+                     q->ahb_addr + q->selected * q->devtype_data->ahb_buf_size,
+                     op->data.nbytes);
 }
 
 static void fsl_qspi_fill_txfifo(struct fsl_qspi *q,
@@ -628,7 +632,9 @@ static int fsl_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
 
        fsl_qspi_select_mem(q, mem->spi);
 
-       qspi_writel(q, q->memmap_phy, base + QUADSPI_SFAR);
+       qspi_writel(q,
+                   q->memmap_phy + q->selected * q->devtype_data->ahb_buf_size,
+                   base + QUADSPI_SFAR);
 
        qspi_writel(q, qspi_readl(q, base + QUADSPI_MCR) |
                    QUADSPI_MCR_CLR_RXF_MASK | QUADSPI_MCR_CLR_TXF_MASK,
@@ -727,6 +733,15 @@ static int fsl_qspi_default_setup(struct fsl_qspi *q)
                    QUADSPI_BUF3CR_ADATSZ(q->devtype_data->ahb_buf_size / 8),
                    base + QUADSPI_BUF3CR);
 
+       qspi_writel(q, q->devtype_data->ahb_buf_size + q->memmap_phy,
+                   base + QUADSPI_SFA1AD);
+       qspi_writel(q, q->devtype_data->ahb_buf_size * 2 + q->memmap_phy,
+                   base + QUADSPI_SFA2AD);
+       qspi_writel(q, q->devtype_data->ahb_buf_size * 3 + q->memmap_phy,
+                   base + QUADSPI_SFB1AD);
+       qspi_writel(q, q->devtype_data->ahb_buf_size * 4 + q->memmap_phy,
+                   base + QUADSPI_SFB2AD);
+
        q->selected = -1;
 
        /* Enable the module */