Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f80e521c authored by Gabor Juhos's avatar Gabor Juhos Committed by David Woodhouse
Browse files

mtd: m25p80: add support for the Intel/Numonyx {16,32,64}0S33B SPI flash chips 



Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 60845e72

drivers/mtd/devices/m25p80.c

+7 −1
Original line number Diff line number Diff line
@@ -645,6 +645,11 @@ static const struct spi_device_id m25p_ids[] = { 
	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },

	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },



	/* Intel/Numonyx -- xxxs33b */

	{ "160s33b",  INFO(0x898911, 0, 64 * 1024,  32, 0) },

	{ "320s33b",  INFO(0x898912, 0, 64 * 1024,  64, 0) },

	{ "640s33b",  INFO(0x898913, 0, 64 * 1024, 128, 0) },



	/* Macronix */

	{ "mx25l4005a",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },

	{ "mx25l8005",   INFO(0xc22014, 0, 64 * 1024,  16, 0) },
@@ -834,11 +839,12 @@ static int __devinit m25p_probe(struct spi_device *spi) 
	dev_set_drvdata(&spi->dev, flash);



	/*

	 * Atmel and SST serial flash tend to power

	 * Atmel, SST and Intel/Numonyx serial flash tend to power

	 * up with the software protection bits set

	 */



	if (info->jedec_id >> 16 == 0x1f ||

	    info->jedec_id >> 16 == 0x89 ||

	    info->jedec_id >> 16 == 0xbf) {

		write_enable(flash);

		write_sr(flash, 0);