drivers: mtd: spi: Check SPI_TX_QUAD mode if RD_QUADIO flag is set

This patch checks for SPI_TX_QUAD mode if RD_QUADIO flag is set, as
RD_QUADIO uses 4 lines for TX. If SPI_TX_QUAD mode is not set then
CMD_READ_QUAD_IO_FAST should not be used.

Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 570613acc31919f8ffce540fa59ee97f0ba5ab6f..ac71fbb8d191f7086cd9a2e03d6744a8919ec5e4 100644 (file)
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -1677,7 +1677,7 @@ int spi_flash_scan(struct spi_flash *flash)
                if (((JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_SPANSION) &&
                     (info->id[5] == SPI_FLASH_SPANSION_S25FS_FMLY)) ||
                    ((JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_ISSI) &&
-                     info->flags & RD_QUADIO))
+                     info->flags & RD_QUADIO && spi->mode & SPI_TX_QUAD))
                        flash->read_cmd = CMD_READ_QUAD_IO_FAST;
        } else if (spi->mode & SPI_RX_DUAL && info->flags & RD_DUAL) {
                flash->read_cmd = CMD_READ_DUAL_OUTPUT_FAST;