[PATCH] mtd: m25p80: Use OPCODE_QUAD_READ_4B for 4-byte addressing

[Brian Norris]

On Fri, Jan 17, 2014 at 10:04:54AM +0800, Huang Shijie wrote:
> On Thu, Jan 16, 2014 at 01:05:29PM -0800, Brian Norris wrote:
> > On Thu, Jan 16, 2014 at 01:09:34AM +0100, Marek Vasut wrote:
> > > On Wednesday, January 15, 2014 at 04:48:55 PM, Geert Uytterhoeven wrote:
> > > > From: Geert Uytterhoeven <geert+renesas at linux-m68k.org>
> > > > 
> > > > 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.
> > 
> > Wow, I noticed this and had a patch privately queued over a month ago
> > for this, but I forgot to send it out... Thanks for noticing!
> > 
> > > > Signed-off-by: Geert Uytterhoeven <geert+renesas at linux-m68k.org>
> > > 
> > > Looks all right.
> > > 
> > > Acked-by: Marek Vasut <marex at denx.de>
> > 
> > Pushed to l2-mtd.git.
> this is a bad news to me. I have to send out a new version for the SPI NOR framework.
> 
> could this patch be merged after my spi-nor patch set? or create a new patch based
> on the spi-nor framework.

This patch is a priority, since it's a bugfix to one that's already
queued up, so it must go first. I haven't taken a look at your latest
series, and I haven't seen comments lately. Was everyone happy with it?
If this conflict is the only problem, I'm sure that can be fixed
trivially. But I'm not sure if it's ready yet anyway. I won't be able to
get to it until next week (at the earliest).

Brian