mtd: spi-nor: unify read opcode variants with ST SPI FSM

serial_flash_cmds.h defines our opcodes a little differently. Let's
borrow its naming, since it's borrowed from the SFDP standard, and it's
more extensible.

This prepares us for merging serial_flash_cmds.h and spi-nor.h opcode
listing.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Acked-by: Huang Shijie <b32955@freescale.com>

1 files changed, 8 insertions, 8 deletions

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;