aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu CASTET <matthieu.castet@parrot.com>2012-09-25 05:05:27 -0400
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-11-15 08:37:46 -0500
commit0aa87b7563f138149429f35727b975ec25a494a6 (patch)
tree744a232b3dde044d11c864664c586784ae95cd6d
parent12ad2be9d1db3dcce08f29bdc5415db3af58fa60 (diff)
mtd: m25p80: add support for the windbond w25q256 chip
Signed-off-by: Matthieu CASTET <matthieu.castet@parrot.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
-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 82f977456b88..7e2d8f9525b0 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -161,6 +161,7 @@ static inline int set_4byte(struct m25p *flash, u32 jedec_id, int enable)
161{ 161{
162 switch (JEDEC_MFR(jedec_id)) { 162 switch (JEDEC_MFR(jedec_id)) {
163 case CFI_MFR_MACRONIX: 163 case CFI_MFR_MACRONIX:
164 case 0xEF /* winbond */:
164 flash->command[0] = enable ? OPCODE_EN4B : OPCODE_EX4B; 165 flash->command[0] = enable ? OPCODE_EN4B : OPCODE_EX4B;
165 return spi_write(flash->spi, flash->command, 1); 166 return spi_write(flash->spi, flash->command, 1);
166 default: 167 default:
@@ -741,6 +742,7 @@ static const struct spi_device_id m25p_ids[] = {
741 { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) }, 742 { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
742 { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) }, 743 { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
743 { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) }, 744 { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
745 { "w25q256", INFO(0xef4019, 0, 64 * 1024, 512, SECT_4K) },
744 746
745 /* Catalyst / On Semiconductor -- non-JEDEC */ 747 /* Catalyst / On Semiconductor -- non-JEDEC */
746 { "cat25c11", CAT25_INFO( 16, 8, 16, 1) }, 748 { "cat25c11", CAT25_INFO( 16, 8, 16, 1) },