2 files changed, 11 insertions, 11 deletions

diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c
index 2977f026f39d..b41bbbc531ff 100644
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
@@ -294,12 +294,12 @@ static void fsl_qspi_init_lut(struct fsl_qspi *q)
         lut_base = SEQID_QUAD_READ * 4;
 
         if (q->nor_size <= SZ_16M) {
-                cmd = SPINOR_OP_QUAD_READ;
+                cmd = SPINOR_OP_READ_1_1_4;
                 addrlen = ADDR24BIT;
                 dummy = 8;
         } else {
                 /* use the 4-byte address */
-                cmd = SPINOR_OP_QUAD_READ;
+                cmd = SPINOR_OP_READ_1_1_4;
                 addrlen = ADDR32BIT;
                 dummy = 8;
         }
@@ -388,7 +388,7 @@ static void fsl_qspi_init_lut(struct fsl_qspi *q)
 static int fsl_qspi_get_seqid(struct fsl_qspi *q, u8 cmd)
 {
         switch (cmd) {
-        case SPINOR_OP_QUAD_READ:
+        case SPINOR_OP_READ_1_1_4:
                 return SEQID_QUAD_READ;
         case SPINOR_OP_WREN:
                 return SEQID_WREN;
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 1716f3ce9949..d6f44d527701 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1014,16 +1014,16 @@ int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id,
         /* Default commands */
         switch (nor->flash_read) {
         case SPI_NOR_QUAD:
-                nor->read_opcode = SPINOR_OP_QUAD_READ;
+                nor->read_opcode = SPINOR_OP_READ_1_1_4;
                 break;
         case SPI_NOR_DUAL:
-                nor->read_opcode = SPINOR_OP_DUAL_READ;
+                nor->read_opcode = SPINOR_OP_READ_1_1_2;
                 break;
         case SPI_NOR_FAST:
-                nor->read_opcode = SPINOR_OP_FAST_READ;
+                nor->read_opcode = SPINOR_OP_READ_FAST;
                 break;
         case SPI_NOR_NORMAL:
-                nor->read_opcode = SPINOR_OP_NORM_READ;
+                nor->read_opcode = SPINOR_OP_READ;
                 break;
         default:
                 dev_err(dev, "No Read opcode defined\n");
@@ -1041,16 +1041,16 @@ int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id,
                         /* Dedicated 4-byte command set */
                         switch (nor->flash_read) {
                         case SPI_NOR_QUAD:
-                                nor->read_opcode = SPINOR_OP_QUAD_READ_4B;
+                                nor->read_opcode = SPINOR_OP_READ4_1_1_4;
                                 break;
                         case SPI_NOR_DUAL:
-                                nor->read_opcode = SPINOR_OP_DUAL_READ_4B;
+                                nor->read_opcode = SPINOR_OP_READ4_1_1_2;
                                 break;
                         case SPI_NOR_FAST:
-                                nor->read_opcode = SPINOR_OP_FAST_READ_4B;
+                                nor->read_opcode = SPINOR_OP_READ4_FAST;
                                 break;
                         case SPI_NOR_NORMAL:
-                                nor->read_opcode = SPINOR_OP_NORM_READ_4B;
+                                nor->read_opcode = SPINOR_OP_READ4;
                                 break;
                         }
                         nor->program_opcode = SPINOR_OP_PP_4B;