summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-04-22 16:45:31 +0400
committerBrian Norris <computersforpeace@gmail.com>2014-05-13 00:16:26 +0400
commit8848e161b79421e340bb13facc11d89570b77940 (patch)
treefaee0377d185b5715e4f4d63a20b0d624673e759 /drivers
parent8d808959e4c2151f7b5960dc6dfd7b74d95c92a0 (diff)
downloadlinux-8848e161b79421e340bb13facc11d89570b77940.tar.xz
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@glider.be> Acked-by: Huang Shijie <shijie8@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/devices/m25p80.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 1557d8f672c1..ed7e0a1bed3c 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;