| Message ID | 1390309159-19643-5-git-send-email-geert@linux-m68k.org |
|---|---|
| State | Accepted |
| Commit | f5e00838e83f6fc93f42c7a01b0c612031955b31 |
| Headers | show |
On Tuesday, January 21, 2014 at 01:59:19 PM, Geert Uytterhoeven wrote: > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Spansion s25fl256s1 and s25fl512s support Dual SPI transfers, hence set the > M25P80_DUAL_READ flag. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > --- > drivers/mtd/devices/m25p80.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c > index 73bf661100f7..f0871a2e449d 100644 > --- a/drivers/mtd/devices/m25p80.c > +++ b/drivers/mtd/devices/m25p80.c > @@ -960,8 +960,8 @@ static const struct spi_device_id m25p_ids[] = { > { "s25sl032p", INFO(0x010215, 0x4d00, 64 * 1024, 64, 0) }, > { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, 0) }, > { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) }, > - { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, M25P80_QUAD_READ) > }, - { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, > M25P80_QUAD_READ) }, + { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, > 512, M25P80_DUAL_READ | M25P80_QUAD_READ) }, + { "s25fl512s", > INFO(0x010220, 0x4d00, 256 * 1024, 256, M25P80_DUAL_READ | > M25P80_QUAD_READ) }, { "s70fl01gs", INFO(0x010221, 0x4d00, 256 * 1024, > 256, 0) }, > { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024, 64, 0) }, > { "s25sl12801", INFO(0x012018, 0x0301, 64 * 1024, 256, 0) }, Why don't you lump this together with 1/4 ? :) Best regards, Marek Vasut
On Tue, Jan 21, 2014 at 4:42 PM, Marek Vasut <marex@denx.de> wrote: >> Spansion s25fl256s1 and s25fl512s support Dual SPI transfers, hence set the >> M25P80_DUAL_READ flag. > Why don't you lump this together with 1/4 ? :) Because I don't want to delay Quad support for s25fl512s by bike-shedding about the need for Dual support. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Tuesday, January 21, 2014 at 04:58:59 PM, Geert Uytterhoeven wrote: > On Tue, Jan 21, 2014 at 4:42 PM, Marek Vasut <marex@denx.de> wrote: > >> Spansion s25fl256s1 and s25fl512s support Dual SPI transfers, hence set > >> the M25P80_DUAL_READ flag. > > > > Why don't you lump this together with 1/4 ? :) > > Because I don't want to delay Quad support for s25fl512s by bike-shedding > about the need for Dual support. > > Gr{oetje,eeting}s, OK, gotcha. Either way is fine with me here. Best regards, Marek Vasut
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 73bf661100f7..f0871a2e449d 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -960,8 +960,8 @@ static const struct spi_device_id m25p_ids[] = { { "s25sl032p", INFO(0x010215, 0x4d00, 64 * 1024, 64, 0) }, { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, 0) }, { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) }, - { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, M25P80_QUAD_READ) }, - { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, M25P80_QUAD_READ) }, + { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, M25P80_DUAL_READ | M25P80_QUAD_READ) }, + { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, M25P80_DUAL_READ | M25P80_QUAD_READ) }, { "s70fl01gs", INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) }, { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024, 64, 0) }, { "s25sl12801", INFO(0x012018, 0x0301, 64 * 1024, 256, 0) },