diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index c7f5548..65ab3e3 100644
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -472,7 +472,13 @@
 		    op->addr.nbytes) {
 			for (i = 0; i < ARRAY_SIZE(lutval); i++)
 				qspi_writel(q, lutval[i], base + QUADSPI_AHB_LUT_REG(i));
+
+			qspi_writel(q, QUADSPI_BFGENCR_SEQID(SEQID_LUT_AHB),
+				q->iobase + QUADSPI_BFGENCR);
 		}
+	} else {
+		qspi_writel(q, QUADSPI_BFGENCR_SEQID(SEQID_LUT),
+			q->iobase + QUADSPI_BFGENCR);
 	}
 
 	/* lock LUT */
@@ -737,13 +743,6 @@
 	qspi_writel(q, 0, base + QUADSPI_BUF1IND);
 	qspi_writel(q, 0, base + QUADSPI_BUF2IND);
 
-	if (IS_ENABLED(CONFIG_FSL_QSPI_AHB_FULL_MAP))
-		qspi_writel(q, QUADSPI_BFGENCR_SEQID(SEQID_LUT_AHB),
-			    q->iobase + QUADSPI_BFGENCR);
-	else
-		qspi_writel(q, QUADSPI_BFGENCR_SEQID(SEQID_LUT),
-			    q->iobase + QUADSPI_BFGENCR);
-
 	qspi_writel(q, QUADSPI_RBCT_WMRK_MASK, base + QUADSPI_RBCT);
 	qspi_writel(q, QUADSPI_BUF3CR_ALLMST_MASK |
 		    QUADSPI_BUF3CR_ADATSZ(q->devtype_data->ahb_buf_size / 8),