From 0254eeaf58dde672d4bb667859de87ea02c0d703 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Date: Wed, 15 Jan 2014 16:48:55 +0100
Subject: mtd: m25p80: Use OPCODE_QUAD_READ_4B for 4-byte addressing

commit 3487a63955c34ea508bcf4ca5131ddd953876e2d ("drivers: mtd: m25p80: add
quad read support") in -next added both the 3-byte OPCODE_QUAD_READ and the
4-byte OPCODE_QUAD_READ_4B, but incorrectly uses OPCODE_QUAD_READ for both
3-byte and 4-byte addressing.

Use OPCODE_QUAD_READ_4B in the 4-byte case to fix this.

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Marek Vasut <marex@denx.de>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
(cherry picked from commit 7587f64d546d6a05dab0a7d1ac964e7ac12072f0)
Change-Id: I94b049c4e645600e8b692e835f1eb427b1292ab1
Reviewed-on: http://git.am.freescale.net:8181/20043
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.com>

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 7b976e8..19632e3 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -1250,7 +1250,7 @@ static int m25p_probe(struct spi_device *spi)
 			/* Dedicated 4-byte command set */
 			switch (flash->flash_read) {
 			case M25P80_QUAD:
-				flash->read_opcode = OPCODE_QUAD_READ;
+				flash->read_opcode = OPCODE_QUAD_READ_4B;
 				break;
 			case M25P80_FAST:
 				flash->read_opcode = OPCODE_FAST_READ_4B;
-- 
cgit v0.10.2