Skip to contentSkip to conversation

sf: Make IO modes at last in read modes

PATCH New Jagan Teki 2 participants 2 messages Dec 28, 2015 – Dec 29, 2015 Memory technology devices (MTD)

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Bin Meng <[email protected]>
Cc Michal Simek <[email protected]>
Cc Siva Durga Prasad Paladugu <[email protected]>
---
 drivers/mtd/spi/sf_internal.h | 4 ++--
 drivers/mtd/spi/spi_flash.c   | 2 +-
 include/spi.h                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/spi/sf_internal.h +2 -2
index 55ba81e..007a5a0 100644
@@ -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),
 };
 
drivers/mtd/spi/spi_flash.c +1 -1
index 691be1a..e92f729 100644
@@ -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 */
include/spi.h +1 -1
index 803fb40..d09c901 100644
@@ -105,7 +105,7 @@ struct spi_slave {
 #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 */
 
 	unsigned int wordlen;
 	unsigned int max_write_size;
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 sf: Make IO modes at last in read modes

Quoted 9 lines · Jagan Teki

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

Cc Simon Glass <[email protected]>
Cc Bin Meng <[email protected]>
Cc Michal Simek <[email protected]>
Cc Siva Durga Prasad Paladugu <[email protected]>
Quoted 6 lines
---
 drivers/mtd/spi/sf_internal.h | 4 ++--
 drivers/mtd/spi/spi_flash.c   | 2 +-
 include/spi.h                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)