mtd: m25p80: Revive dual read support

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=8848e161b79421e340bb13facc11d89570b77940
Commit:     8848e161b79421e340bb13facc11d89570b77940
Parent:     8d808959e4c2151f7b5960dc6dfd7b74d95c92a0
Author:     Geert Uytterhoeven <geert+renesas at glider.be>
AuthorDate: Tue Apr 22 14:45:31 2014 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Mon May 12 13:16:26 2014 -0700

    mtd: m25p80: Revive dual read support
    
    Commit 03e296f613affcc2671c1e86d8c25ecad867204e ("mtd: m25p80: use the SPI
    nor framework") accidentally removed support for Dual SPI read transfers.
    Add it back.
    
    Signed-off-by: Geert Uytterhoeven <geert+renesas at glider.be>
    Acked-by: Huang Shijie <shijie8 at gmail.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/devices/m25p80.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 1557d8f..ed7e0a1b 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -221,6 +221,8 @@ static int m25p_probe(struct spi_device *spi)
 
 	if (spi->mode & SPI_RX_QUAD)
 		mode = SPI_NOR_QUAD;
+	else if (spi->mode & SPI_RX_DUAL)
+		mode = SPI_NOR_DUAL;
 	ret = spi_nor_scan(nor, spi_get_device_id(spi), mode);
 	if (ret)
 		return ret;