| Message ID | 1451323977-24252-10-git-send-email-jteki@openedev.com |
|---|---|
| State | Accepted |
| Commit | 1c17f5ec571cac6e0867f64607b052d6ffa0b1c1 |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
On Tue, Dec 29, 2015 at 1:32 AM, Jagan Teki <jteki@openedev.com> wrote: > 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: Bin Meng <bmeng.cn@gmail.com> > Cc: Michal Simek <michal.simek@xilinx.com> > Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com> > Tested-by: Jagan Teki <jteki@openedev.com> > Signed-off-by: Jagan Teki <jteki@openedev.com> > --- > 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(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 55ba81e..007a5a0 100644 --- 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 691be1a..e92f729 100644 --- 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 80f8523..85866a2 100644 --- 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)