sf: Make IO modes at last in read modes

SLOW, FAST, DUAL, DUAL_IO, QUAD, QUAD_IO changed order to
SLOW, FAST, DUAL, QUAD, DUAL_IO, QUAD_IO

Cc: Simon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Tested-by: Jagan Teki <jteki@openedev.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>

diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index 55ba81e87b216094f71a235654aae5480c6d9329..007a5a085caffa632fb6a3b40922a162e6dbe674 100644 (file)
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -25,8 +25,8 @@ enum spi_read_cmds {
        ARRAY_SLOW              = BIT(0),
        ARRAY_FAST              = BIT(1),
        DUAL_OUTPUT_FAST        = BIT(2),
-       DUAL_IO_FAST            = BIT(3),
-       QUAD_OUTPUT_FAST        = BIT(4),
+       QUAD_OUTPUT_FAST        = BIT(3),
+       DUAL_IO_FAST            = BIT(4),
        QUAD_IO_FAST            = BIT(5),
 };
 

diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 5766c187f93d0bddf01949eb1d177bb87494edad..a567414669073f1a947d9d99cc35284c2f1286c6 100644 (file)
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -975,8 +975,8 @@ int spi_flash_scan(struct spi_flash *flash)
                CMD_READ_ARRAY_SLOW,
                CMD_READ_ARRAY_FAST,
                CMD_READ_DUAL_OUTPUT_FAST,
-               CMD_READ_DUAL_IO_FAST,
                CMD_READ_QUAD_OUTPUT_FAST,
+               CMD_READ_DUAL_IO_FAST,
                CMD_READ_QUAD_IO_FAST };
 
        /* Read the ID codes */

diff --git a/include/spi.h b/include/spi.h
index 80f85230765a7e75708754daf8dc3c93f4de1339..85866a27fcb7f65b3ef11cdea2a3e2e832ca3712 100644 (file)
--- a/include/spi.h
+++ b/include/spi.h
@@ -30,7 +30,7 @@
 #define SPI_RX_SLOW    BIT(0)                  /* receive with 1 wire slow */
 #define SPI_RX_FAST    BIT(1)                  /* receive with 1 wire fast */
 #define SPI_RX_DUAL    BIT(2)                  /* receive with 2 wires */
-#define SPI_RX_QUAD    BIT(4)                  /* receive with 4 wires */
+#define SPI_RX_QUAD    BIT(3)                  /* receive with 4 wires */
 
 /* SPI bus connection options - see enum spi_dual_flash */
 #define SPI_CONN_DUAL_SHARED           (1 << 0)