From 4744762008b2694df1af4c4b5bbf687737619bd7 Mon Sep 17 00:00:00 2001 From: Matthieu CASTET Date: Tue, 25 Sep 2012 11:05:27 +0200 Subject: [PATCH] --- yaml --- r: 347137 b: refs/heads/master c: 0aa87b7563f138149429f35727b975ec25a494a6 h: refs/heads/master i: 347135: 64d6a2696d08ead3878572af667f579b17a119ba v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/m25p80.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fff208b8f4c0..6402a1e9c5f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12ad2be9d1db3dcce08f29bdc5415db3af58fa60 +refs/heads/master: 0aa87b7563f138149429f35727b975ec25a494a6 diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c index 82f977456b88..7e2d8f9525b0 100644 --- a/trunk/drivers/mtd/devices/m25p80.c +++ b/trunk/drivers/mtd/devices/m25p80.c @@ -161,6 +161,7 @@ static inline int set_4byte(struct m25p *flash, u32 jedec_id, int enable) { switch (JEDEC_MFR(jedec_id)) { case CFI_MFR_MACRONIX: + case 0xEF /* winbond */: flash->command[0] = enable ? OPCODE_EN4B : OPCODE_EX4B; return spi_write(flash->spi, flash->command, 1); default: @@ -741,6 +742,7 @@ static const struct spi_device_id m25p_ids[] = { { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) }, { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) }, { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) }, + { "w25q256", INFO(0xef4019, 0, 64 * 1024, 512, SECT_4K) }, /* Catalyst / On Semiconductor -- non-JEDEC */ { "cat25c11", CAT25_INFO( 16, 8, 16, 1) },