From: Matthieu CASTET Date: Tue, 25 Sep 2012 09:05:27 +0000 (+0200) Subject: mtd: m25p80: add support for the windbond w25q256 chip X-Git-Tag: next-20121019~48^2~23 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e43987285a5f9dda037817f8a3fb13bd1b6c31b4;p=karo-tx-linux.git mtd: m25p80: add support for the windbond w25q256 chip Signed-off-by: Matthieu CASTET Signed-off-by: Artem Bityutskiy --- 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) { 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) },